diff options
| author | Thomas Park <thomas@thomaspark.me> | 2015-01-22 17:51:08 -0500 |
|---|---|---|
| committer | Thomas Park <thomas@thomaspark.me> | 2015-01-22 17:51:08 -0500 |
| commit | 36a85a7d153d1d7ed13627f2269fef8c60743cf4 (patch) | |
| tree | 195b7b67688b3975e6ee35f22346e3b5c86deb6b /paper/_bootswatch.scss | |
| parent | 80de0c48ab8a9f5ab130bcb598420d7f8ac687d8 (diff) | |
| parent | 361650c0e9984269f8077f9048eed657dbe5bea4 (diff) | |
paper: fix merge conflict
Diffstat (limited to 'paper/_bootswatch.scss')
| -rw-r--r-- | paper/_bootswatch.scss | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/paper/_bootswatch.scss b/paper/_bootswatch.scss index 336b3918..90de5c71 100644 --- a/paper/_bootswatch.scss +++ b/paper/_bootswatch.scss @@ -123,7 +123,8 @@ input[type=number], [type=text].form-control, [type=password].form-control, [type=email].form-control, -[type=tel].form-control { +[type=tel].form-control, +[contenteditable].form-control { padding: 0; border: none; border-radius: 0; |