diff options
| author | Christoph <c@kluenter.de> | 2016-03-09 15:37:18 +0100 |
|---|---|---|
| committer | Christoph <c@kluenter.de> | 2016-03-09 15:37:18 +0100 |
| commit | 3994188a0e4d9468518132f179eb56fab7760fbe (patch) | |
| tree | 224e5d536b9a6c4859671b2cff57f1f60236ef9f /web-ui/app/scss | |
| parent | 281f88ba668e38883e822ea5bd96134ad3a3aa6c (diff) | |
| parent | 23b175742f20d96e5b5d3d9cfcc0ed7067197f92 (diff) | |
Merge pull request #636 from pixelated/dev/sandbox
Dev/sandbox
Diffstat (limited to 'web-ui/app/scss')
| -rw-r--r-- | web-ui/app/scss/_read.scss | 7 | ||||
| -rw-r--r-- | web-ui/app/scss/sandbox.scss | 20 |
2 files changed, 27 insertions, 0 deletions
diff --git a/web-ui/app/scss/_read.scss b/web-ui/app/scss/_read.scss index 2c079408..236a7c7c 100644 --- a/web-ui/app/scss/_read.scss +++ b/web-ui/app/scss/_read.scss @@ -66,6 +66,13 @@ .bodyArea { padding: 10px 30px 0 30px; + box-sizing: border-box; + + iframe { + box-sizing: inherit; + border: none; + width: 100%; + } } .attachmentsAreaWrap { diff --git a/web-ui/app/scss/sandbox.scss b/web-ui/app/scss/sandbox.scss new file mode 100644 index 00000000..3cb4c441 --- /dev/null +++ b/web-ui/app/scss/sandbox.scss @@ -0,0 +1,20 @@ +$search-highlight: #FFEF29; + +body { + font-family: "Open Sans", "Microsoft YaHei", "Hiragino Sans GB", "Hiragino Sans GB W3", "微软雅黑", "Helvetica Neue", Arial, sans-serif; + font-size: 13px; + line-height: 1.2em; + background: white; + color: #333; + padding: 0; + margin: 0; + font-weight: normal; + -webkit-font-smoothing: antialiased; + font-style: normal; + box-sizing: border-box; + word-wrap: break-word; +} + +.search-highlight { + background-color: $search-highlight; +} |