diff options
Diffstat (limited to 'web/sass-files')
| -rw-r--r-- | web/sass-files/sass/partials/_admin-console.scss | 17 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_base.scss | 14 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_files.scss | 9 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_loading.scss | 2 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_markdown.scss | 43 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_mentions.scss | 9 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_modal.scss | 42 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_post.scss | 14 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_settings.scss | 15 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_videos.scss | 10 |
10 files changed, 135 insertions, 40 deletions
diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss index 9823d2611..11794a269 100644 --- a/web/sass-files/sass/partials/_admin-console.scss +++ b/web/sass-files/sass/partials/_admin-console.scss @@ -1,5 +1,5 @@ -.sidebar--left { - &.sidebar--collapsable { + +.sidebar--left { &.sidebar--collapsable { background: #333; .team__header { background: transparent; @@ -9,7 +9,7 @@ li { padding: 0; .icon { - width: 15px; + width: 17px; } > a { color: #fff; @@ -19,6 +19,11 @@ background-color: $primary-color; } } + > h4 { + background: #333; + padding: 10px 10px; + margin: 1px 0 0; + } } .menu-icon--right { vertical-align: top; @@ -29,12 +34,15 @@ font-size: 13px; right: -2px; position: relative; + color: #fff; } } &.nav__sub-menu { - padding: 5px 0; background: #111; -webkit-font-smoothing: auto; + &.padded { + padding: 5px 0; + } li { > a { font-size: 13px; @@ -88,6 +96,7 @@ overflow: auto; background-color: #f1f1f1; padding: 0 20px 20px; + min-height: 600px; } .wrapper--fixed { max-width: 800px; diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 592d5e62e..87d9b8200 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -34,8 +34,18 @@ body { } } -b, strong { - font-weight: 600; +.popover { + color: #333; + a { + color: $primary-color; + &:hover, &:focus { + color: $primary-color; + } + } +} + +.word-break--all { + word-break: break-all; } a { diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss index 405265f92..6dbb82810 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -157,23 +157,23 @@ border-left: 1px solid #ddd; font-size: 13px; padding: 7px; + color: #333; .post-image__name { margin-bottom: 3px; display: block; - color: #333; } .post-image__download { display: inline-block; padding-right: 7px; cursor: pointer; - color: #555; + @include opacity(0.7); } .post-image__type { - color: grey; + @include opacity(0.6); } .post-image__size { margin-left: 4px; - color: grey; + @include opacity(0.6); } } a { @@ -214,4 +214,3 @@ } } } - diff --git a/web/sass-files/sass/partials/_loading.scss b/web/sass-files/sass/partials/_loading.scss index d71055722..ab8601df6 100644 --- a/web/sass-files/sass/partials/_loading.scss +++ b/web/sass-files/sass/partials/_loading.scss @@ -37,4 +37,4 @@ to { opacity: 0.1; } } } -} +}
\ No newline at end of file diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss index c09e9d7b4..122586354 100644 --- a/web/sass-files/sass/partials/_markdown.scss +++ b/web/sass-files/sass/partials/_markdown.scss @@ -1,5 +1,21 @@ .markdown__heading { - font-weight: bold; + font-weight: 700; +} +.markdown__paragraph-inline { + display: inline; + + .markdown__paragraph-inline { + margin-left: 4px; + } +} +.post-body { + hr { + height: 4px; + padding: 0; + margin: 15px 0 16px; + background-color: #e7e7e7; + border: 0 none; + @include opacity(0.2); + } } .markdown__table { background: #fff; @@ -15,6 +31,26 @@ } } } +blockquote { + border: none; + position: relative; + font-size: 16px; + padding: 10px 10px 10px 38px; + margin-bottom: 0; + &:before { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + display: inline-block; + text-decoration: inherit; + content: "\f10d"; + left: 8px; + top: 5px; + position: absolute; + font-size: 20px; + @include opacity(0.6); + } +} pre { border: none; background-color: #f7f7f7; @@ -25,4 +61,7 @@ pre { code { color: #c7254e; } -}
\ No newline at end of file +} +code { + background: #fff; +} diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss index aa893c535..48746ba01 100644 --- a/web/sass-files/sass/partials/_mentions.scss +++ b/web/sass-files/sass/partials/_mentions.scss @@ -63,10 +63,11 @@ padding-left: 10px; } -.mention-highlight { - background-color:#fff2bb; +.mention-link { + color: $primary-color; } -.mention-link { - color:$primary-color; +.mention-highlight { + background-color:#fff2bb; + color: #333; }
\ No newline at end of file diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 38e9b4174..e4e8b20b6 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -3,6 +3,7 @@ } .modal { width: 100%; + color: #333; &.image_modal { .modal-backdrop.in { @include opacity(0.7); @@ -10,12 +11,26 @@ } a, a:focus, a:hover { color: #2389D7; + &.text-danger { + color: #a94442; + } } - .btn.btn-primary { - background: #4285f4; - &:hover, &:focus, &:active { - background: $primary-color--hover; - color: #fff; + .custom-textarea { + color: inherit; + border-color: #ccc; + &:focus { + border-color: #ccc; + box-shadow: none; + } + } + .btn { + font-size: 13px; + &.btn-primary { + background: #4285f4; + &:hover, &:focus, &:active { + background: $primary-color--hover; + color: #fff; + } } } .info__label { @@ -181,16 +196,13 @@ position: relative; max-width: 90%; min-height: 100px; - min-width: 320px; + min-width: 240px; @include border-radius(3px); display: table; margin: 0 auto; &:hover { @include border-radius(3px 3px 0 0); } - &:hover .modal-close { - @include opacity(1); - } &.default { width: 100%; height: 80%; @@ -204,8 +216,15 @@ right: -13px; top: -13px; @include opacity(0); + -webkit-transition: opacity 0.6s; + -moz-transition: opacity 0.6s; + -o-transition: opacity 0.6s; + transition: opacity 0.6s; cursor: pointer; z-index: 9999; + &.modal-close--show { + @include opacity(1); + } } > a { background: #FFF; @@ -217,7 +236,7 @@ max-height: 100%; } } - .image-content { + .modal-content{ box-shadow: none; background: rgba(0, 0, 0, 0); width: 100%; @@ -301,6 +320,7 @@ } } + // Invite New Member .invite { margin-right: 40px; @@ -315,4 +335,4 @@ padding-left: 0; } } -}
\ No newline at end of file +} diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index d4f02cf4b..7532875d6 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -2,13 +2,17 @@ white-space:pre-wrap; word-wrap:break-word; background:transparent; - border:1px solid #ccc !important; + border:1px solid #ccc; position:absolute; top:0px; height:auto; resize: none; line-height:20px; min-height:36px; + &:focus { + border-color: #ccc; + box-shadow: none; + } } .bad-connection { @@ -225,17 +229,17 @@ body.ios { right: 0; position: absolute; top: 1px; - color: #999; + color: #444; + @include opacity(0.5); @include single-transition(all, 0.15s); font-size: 16px; padding: 7px 9px 6px; &:hover, &:active { - color: #444; + @include opacity(0.9); box-shadow: none; } } textarea { - border: none; box-shadow: none; } } @@ -253,7 +257,7 @@ body.ios { line-height: 18px; display: inline-block; font-size: 13px; - color: #777; + @include opacity(0.6); } } } diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index 8dcd8f35c..3aab05d70 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -32,6 +32,7 @@ } .settings-table { display: table; + table-layout: fixed; width: 100%; > div { display: table-cell; @@ -125,6 +126,10 @@ } } + .font--small { + font-size: 13px; + } + .section-describe { color:grey; } @@ -155,8 +160,18 @@ .has-error { color: #a94442; } + .padding-top { + padding-top: 7px; + &.x2 { + padding-top: 14px; + } + } .control-label { color: #555; + font-weight: 600; + &.text-left { + text-align: left; + } } hr { border-color: #ccc; diff --git a/web/sass-files/sass/partials/_videos.scss b/web/sass-files/sass/partials/_videos.scss index de18aa08a..9e1ce29b7 100644 --- a/web/sass-files/sass/partials/_videos.scss +++ b/web/sass-files/sass/partials/_videos.scss @@ -1,6 +1,7 @@ .video-div { position:relative; max-width: 480px; + margin-bottom: 8px; .video-thumbnail { max-width: 100%; height: auto; @@ -19,18 +20,15 @@ } .video-type { - color:grey; + @include opacity(0.8); font-size:15px; - font-weight:200; margin:0px; padding:0px; } .video-uploader { - font-size:15px; - margin-top:3px; - margin-bottom:0px; - padding:0px; + font-size: 13px; + margin: 0 0 15px; } .video-title { |