diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-25 22:42:38 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-25 22:42:38 -0700 |
| commit | 70b5918734d996a2b5b3710c2ed519f77f4764d4 (patch) | |
| tree | 12aac9f88de68cb79404a3985e6bfe774ad8f066 /web/sass-files/sass/partials/_settings.scss | |
| parent | 473221dbada7ad7739d6a969d9d3d5c9c276941b (diff) | |
| parent | ae2898107d275176126ab07ca1886fd7fd7ddad4 (diff) | |
| download | chat-70b5918734d996a2b5b3710c2ed519f77f4764d4.tar.gz chat-70b5918734d996a2b5b3710c2ed519f77f4764d4.tar.bz2 chat-70b5918734d996a2b5b3710c2ed519f77f4764d4.zip | |
Merge branch 'master' into PLT-25
Diffstat (limited to 'web/sass-files/sass/partials/_settings.scss')
| -rw-r--r-- | web/sass-files/sass/partials/_settings.scss | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index 9af045f98..c881f9073 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -1,5 +1,6 @@ @import "access-history"; @import "activity-log"; +@import "webhooks"; .user-settings { min-height:300px; @@ -29,6 +30,9 @@ li { list-style: none; } + label { + font-weight: 600; + } .settings-table { display: table; table-layout: fixed; @@ -37,6 +41,11 @@ display: table-cell; vertical-align: top; } + .nav { + position: fixed; + top: 57px; + width: 180px; + } .security-links { margin-right: 20px; .fa { @@ -129,10 +138,6 @@ } } - .font--small { - font-size: 13px; - } - .section-describe { @include opacity(0.7); white-space:pre; @@ -161,14 +166,29 @@ .setting-list-item { margin-top:7px; - .has-error { - color: #a94442; + } + .has-error { + color: #a94442; + } + .no-padding--left { + padding-left: 0; + } + .padding-top { + padding-top: 7px; + &.x2 { + padding-top: 14px; } - .padding-top { - padding-top: 7px; - &.x2 { - padding-top: 14px; - } + &.x3 { + padding-top: 21px; + } + } + .padding-bottom { + padding-bottom: 7px; + &.x2 { + padding-bottom: 14px; + } + &.x3 { + padding-bottom: 21px; } .control-label { font-weight: 600; |