diff options
author | =Corey Hulen <corey@hulen.com> | 2016-03-17 09:51:45 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-03-17 09:51:45 -0700 |
commit | 5273559ca101d8ae4a55104f18081ab011e5068c (patch) | |
tree | f152b638101b224ffc59ed000e384b651915266a /webapp/sass/routes/_settings.scss | |
parent | 074f15f761ff50388b58e35e8354c139c06a807e (diff) | |
parent | 128204b47a9ff89bf2bea97cd21d3b8892151e69 (diff) | |
download | chat-5273559ca101d8ae4a55104f18081ab011e5068c.tar.gz chat-5273559ca101d8ae4a55104f18081ab011e5068c.tar.bz2 chat-5273559ca101d8ae4a55104f18081ab011e5068c.zip |
Fixing merge
Diffstat (limited to 'webapp/sass/routes/_settings.scss')
-rw-r--r-- | webapp/sass/routes/_settings.scss | 189 |
1 files changed, 118 insertions, 71 deletions
diff --git a/webapp/sass/routes/_settings.scss b/webapp/sass/routes/_settings.scss index 3c735be3c..1c3f2e308 100644 --- a/webapp/sass/routes/_settings.scss +++ b/webapp/sass/routes/_settings.scss @@ -2,41 +2,47 @@ .user-settings { min-height: 300px; + .table-responsive { - max-width: 560px; max-height: 300px; + max-width: 560px; } } .modal { .settings-modal { width: 800px; + .modal-back { - width: 50px; - height: 40px; - top: 12px; font-size: 27px; font-weight: normal; + height: 40px; + left: 0; line-height: 32px; position: absolute; - left: 0; text-align: center; + top: 12px; + width: 50px; + .fa { + height: 100%; + left: 0; line-height: inherit; position: absolute; width: 100%; - height: 100%; - left: 0; } } + .modal-body { - padding: 0; margin: 0 auto; min-height: calc(100% - 62px); + padding: 0; } + li { list-style: none; } + label { font-weight: 600; } @@ -44,87 +50,110 @@ .no-padding--left { padding-left: 0; } + .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; + &.text-left { text-align: left; } } } + .profile-img { - width: 128px; height: 128px; + width: 128px; } + .settings-table { - max-width: 1000px; - margin: 0 auto; display: table; + margin: 0 auto; + max-width: 1000px; table-layout: fixed; width: 100%; + > div { display: table-cell; vertical-align: top; } + .nav { position: fixed; width: 179px; + &.position--top { top: 57px; } } + .security-links { margin-right: 20px; + .fa { margin-right: 6px; } } + .settings-links { width: 180px; } + .settings-content { - padding: 0px 20px 30px; + padding: 0 20px 30px; + .modal-header { display: none; } + .section-min { padding: 1em 0; margin-bottom: 0; cursor: pointer; position: relative; @include clearfix; + &:hover { background: #f9f9f9; } + &:hover .fa { display: inline-block; } + &:hover .section-edit { text-decoration: underline; } } .section-max { - background: rgba(black, .05); - padding: 1em 0 1.3em; - margin-bottom: 0; @include clearfix; + @include alpha-property(background, $black, .05); + margin-bottom: 0; + padding: 1em 0 1.3em; + .section-title { margin-bottom: 10px; } @@ -136,50 +165,54 @@ padding: 4px 5px; width: 40px; } + img { border: 1px solid rgba(black, .15); width: 29px; } } + .group--code { + select { + @include appearance(none); + appearance: none; padding-right: 25px; + + &::ms-expand { + display: none; + } } - select::-ms-expand { - display: none; - } + &:before { - pointer-events: none; - position: absolute; - top: 11px; - right: 50px; - z-index: 5; + @include font-smoothing; content: '\f0d7'; display: inline-block; font: normal normal normal 14px/1 FontAwesome; - font-size: inherit; + pointer-events: none; + position: absolute; + right: 50px; text-rendering: auto; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - select { - -moz-appearance: none; - -webkit-appearance: none; - appearance: none; + top: 11px; + z-index: 5; } } + .premade-themes { margin-bottom: 10px; + .theme-label { font-weight: 400; margin-top: 5px; } + img { border: 3px solid transparent; } + .active { img { - border-color: $color--primary; + border-color: $primary-color; } } } @@ -197,12 +230,12 @@ } .theme-elements__header { - margin: 10px 20px 0px 0; border-bottom: 1px solid #ccc; - padding: 5px 0 10px; + cursor: pointer; font-size: em(13.5px); font-weight: 600; - cursor: pointer; + margin: 10px 20px 0 0; + padding: 5px 0 10px; .fa-minus { display: none; @@ -212,39 +245,41 @@ .fa-minus { display: inline-block; } + .fa-plus { display: none; } } .header__icon { - float: right; @include opacity(.5); + float: right; } } .theme-elements__body { - padding-top: 5px; - display: none; + @include border-radius(0 0 3px 3px); @include legacy-pie-clearfix; - background: rgba(255, 255, 255, .05); - padding: 20px 0 0 20px; + @include alpha-property(background-color, $white, .05); + display: none; margin: 0 20px 0 0; - @include border-radius(0 0 3px 3px); + padding: 20px 0 0 20px; } .custom-label { - white-space: nowrap; - font-weight: normal; font-size: 12px; - width: 100%; + font-weight: normal; + margin-bottom: 0; overflow: hidden; text-overflow: ellipsis; - margin-bottom: 0; + white-space: nowrap; + width: 100%; } + .input-group-addon { background: transparent; } + .radio { label { font-weight: 600; @@ -253,32 +288,33 @@ } .section-title { - margin-bottom: 5px; font-weight: 600; + margin-bottom: 5px; padding-right: 50px; } .section-edit { - text-align: right; margin-bottom: 5px; + text-align: right; + .fa { - margin-right: 5px; - font-size: 12px; @include opacity(.5); display: none; + font-size: 12px; + margin-right: 5px; &.fa-chevron-down { - top: -1px; margin-right: 0; position: relative; + top: -1px; } } } .section-describe { - @include opacity(.7); - white-space: pre; @include clearfix; + @include opacity(.7); text-overflow: ellipsis; + white-space: pre; } .divider-dark { @@ -290,8 +326,8 @@ } .setting-list { - padding: 0; list-style-type: none; + padding: 0; } .setting-list__hint { @@ -305,68 +341,77 @@ .setting-list-item { margin-top: 7px; } + .has-error { color: #a94442; } .file-status { + color: #555; font-size: 13px; margin-top: 8px; - color: #555; } .confirm-import { - padding: 4px 10px; margin: 10px 0; + padding: 4px 10px; } } } } + .nav-pills { > li { margin: 0; + a { - padding: 8px 5px 8px 15px; border-radius: 0; color: #777; + padding: 8px 5px 8px 15px; } + .glyphicon { - width: 25px; top: 2px; + width: 25px; } + &:hover { a { - background-color: rgba(black, .1); + @include alpha-property(background-color, $black, .1); } } + &.active { a { - color: #111; background-color: #e1e1e1; + color: #111; + &:before { + background: $black; content: ''; + height: 100%; + left: 0; position: absolute; top: 0; - left: 0; width: 5px; - height: 100%; - background: #000; } } + a, a:hover, a:focus { - background-color: rgba(black, .1); + @include alpha-property(background-color, $black, .1); border-radius: 0; font-weight: 400; - position: relative; - white-space: nowrap; overflow: hidden; + position: relative; text-overflow: ellipsis; + white-space: nowrap; } } } } + h3 { font-size: em(20px); } @@ -391,13 +436,15 @@ .member-div { border-bottom: 1px solid lightgrey; - position: relative; - padding: 2px; margin: 0; + padding: 2px; + position: relative; width: 100%; + &:first-child { border-top: 1px solid lightgrey; } + .post-profile-img { @include border-radius(50px); margin-right: 8px; @@ -407,14 +454,14 @@ .member-role, .member-drop { .fa { - margin-right: 5px; @include opacity(.5); font-size: 12px; + margin-right: 5px; } .member-menu { - top: -50%; right: 110%; + top: -50%; } } @@ -425,13 +472,13 @@ } .member-menu { - right: 0px; left: auto; + right: 0; } .member-list { - width: 100%; overflow-x: visible; + width: 100%; } .member-page { |