From ad29d8be7bbe9ea761435a49d155cd4a9d389a0f Mon Sep 17 00:00:00 2001 From: Arpad Csanyi Date: Sun, 12 Jun 2016 17:11:19 +0200 Subject: [PATCH] Reindent scss files to use 4 spaces instead of 2. --- sass/app.scss | 356 ++++++++++++++++++++++++------------------------ sass/macro.scss | 78 +++++------ sass/style.scss | 252 +++++++++++++++++----------------- 3 files changed, 343 insertions(+), 343 deletions(-) diff --git a/sass/app.scss b/sass/app.scss index b88b4351..5550f059 100644 --- a/sass/app.scss +++ b/sass/app.scss @@ -1,244 +1,244 @@ #main-content { - margin-left: 250px; + margin-left: 250px; } #sidebar-menu { - background-color: #f5f5f5; - border-right: 1px solid #ccc; - position: fixed; - overflow-y: auto; - width: 250px; - height: 100%; + background-color: #f5f5f5; + border-right: 1px solid #ccc; + position: fixed; + overflow-y: auto; + width: 250px; + height: 100%; } // General list styles for the sidebar-menu. ul { - padding: 0; - margin: 0; - - li { - list-style: none; padding: 0; - } + margin: 0; + + li { + list-style: none; + padding: 0; + } } .sidebar { - &__level-1 { - padding: .5rem 1rem; - font-size: 2rem; - line-height: 3rem; + &__level-1 { + padding: .5rem 1rem; + font-size: 2rem; + line-height: 3rem; - &--item { - margin-top: 0; + &--item { + margin-top: 0; - &:nth-child(1) { - margin: 0; - } - } + &:nth-child(1) { + margin: 0; + } + } - .fa-chevron-up, - .fa-chevron-down { - margin-right: 1rem; - font-size: 1.5rem; - position: relative; - top: .5rem; - display: none; - } - - &:hover { - .fa-chevron-up, - .fa-chevron-down { - display: inline-block; - } - } - } - - // General spacing of level-1 and level-2 elements. - &__level-1, - &__level-2 { - padding-left: 15px; - } - - &__level-2 { - margin-left: 15px; - - &--item { - padding: 0 20px 0 0; - - &.active { - background-color: #555; - color: #fff; - - .fa-star { - color: #fff; + .fa-chevron-up, + .fa-chevron-down { + margin-right: 1rem; + font-size: 1.5rem; + position: relative; + top: .5rem; + display: none; } &:hover { - background-color: #555; + .fa-chevron-up, + .fa-chevron-down { + display: inline-block; + } } - } - - // General "right side" icon theming. - .fa.pull-right { - position: relative; - top: 2px; - } - - .fa-star { - color: #666; - } } - } - // General hover over menu items. - &__level-1, - &__level-2--item { - &:hover { - cursor: pointer; - background-color: rgba(0, 0, 0, 0.05); + // General spacing of level-1 and level-2 elements. + &__level-1, + &__level-2 { + padding-left: 15px; + } + + &__level-2 { + margin-left: 15px; + + &--item { + padding: 0 20px 0 0; + + &.active { + background-color: #555; + color: #fff; + + .fa-star { + color: #fff; + } + + &:hover { + background-color: #555; + } + } + + // General "right side" icon theming. + .fa.pull-right { + position: relative; + top: 2px; + } + + .fa-star { + color: #666; + } + } + } + + // General hover over menu items. + &__level-1, + &__level-2--item { + &:hover { + cursor: pointer; + background-color: rgba(0, 0, 0, 0.05); + } } - } } .menu--bottom { - position: absolute; - bottom: 0; - left: 0; - width: 100%; + position: absolute; + bottom: 0; + left: 0; + width: 100%; - .sidebar { - &__level-1 { - background-color: transparent; - padding: 1rem; + .sidebar { + &__level-1 { + background-color: transparent; + padding: 1rem; + } } - } } .pane-title { - margin-bottom: 1em; + margin-bottom: 1em; - &__name, - &__abbrev { - border: none; - border-bottom: 2px dotted #999; - padding: 0 .5rem; - margin: 0 .25rem; + &__name, + &__abbrev { + border: none; + border-bottom: 2px dotted #999; + padding: 0 .5rem; + margin: 0 .25rem; - &.active { - box-shadow: 0 0 0px 1px #ccc, 0 0 5px 0px #ccc; - border-color: transparent; + &.active { + box-shadow: 0 0 0px 1px #ccc, 0 0 5px 0px #ccc; + border-color: transparent; + } } - } } .keymap { - &__is-default { - &.fa-star { - color: #333; - } + &__is-default { + &.fa-star { + color: #333; + } - &.fa-star-o { - color: #333; - } + &.fa-star-o { + color: #333; + } - &:hover { - color: #555; - cursor: pointer; + &:hover { + color: #555; + cursor: pointer; + } } - } } .uhk { - &__layer-switcher { - &--wrapper { - position: relative; + &__layer-switcher { + &--wrapper { + position: relative; - &:before { - content: attr(data-title); - display: inline-block; - position: absolute; - bottom: -0.3em; - right: 100%; - font-size: 2.4rem; - padding-right: .25em; - margin: 0; - } + &:before { + content: attr(data-title); + display: inline-block; + position: absolute; + bottom: -0.3em; + right: 100%; + font-size: 2.4rem; + padding-right: .25em; + margin: 0; + } + } } - } } .keyboard-slider { - position: relative; - overflow: hidden; - width: 100%; - height: auto; - - .uhk__layer-wrapper { + position: relative; + overflow: hidden; width: 100%; height: auto; - text-align: center; - position: absolute; - left: 100%; - &.current { - left: 0; - } + .uhk__layer-wrapper { + width: 100%; + height: auto; + text-align: center; + position: absolute; + left: 100%; - .uhk { - max-width: 100%; - width: 98%; + &.current { + left: 0; + } + + .uhk { + max-width: 100%; + width: 98%; + } } - } } .key-editor__popup { - border: none; - width: 0px; - height: 0px; + border: none; + width: 0px; + height: 0px; - // Static setting for quick portotyping. - position: absolute; - top: 215px; - left: 50%; - margin-left: -310px; + // Static setting for quick portotyping. + position: absolute; + top: 215px; + left: 50%; + margin-left: -310px; } svg.uhk { - rect { - &.active { - //TODO: use a color variable instead of the declaration below. - fill: #337ab7; + rect { + &.active { + //TODO: use a color variable instead of the declaration below. + fill: #337ab7; + } } - } } /* GitHub ribbon */ .github-fork-ribbon { - background-color: #a00; - overflow: hidden; - white-space: nowrap; - position: fixed; - right: -50px; - bottom: 40px; - z-index: 999999; - -webkit-transform: rotate(-45deg); - -moz-transform: rotate(-45deg); - -ms-transform: rotate(-45deg); - -o-transform: rotate(-45deg); - transform: rotate(-45deg); - -webkit-box-shadow: 0 0 10px #888; - -moz-box-shadow: 0 0 10px #888; - box-shadow: 0 0 10px #888; + background-color: #a00; + overflow: hidden; + white-space: nowrap; + position: fixed; + right: -50px; + bottom: 40px; + z-index: 999999; + -webkit-transform: rotate(-45deg); + -moz-transform: rotate(-45deg); + -ms-transform: rotate(-45deg); + -o-transform: rotate(-45deg); + transform: rotate(-45deg); + -webkit-box-shadow: 0 0 10px #888; + -moz-box-shadow: 0 0 10px #888; + box-shadow: 0 0 10px #888; - a { - border: 1px solid #faa; - color: #fff; - display: block; - font: bold 81.25% 'Helvetica Neue', Helvetica, Arial, sans-serif; - margin: 1px 0; - padding: 10px 50px; - text-align: center; - text-decoration: none; - text-shadow: 0 0 5px #444; - } + a { + border: 1px solid #faa; + color: #fff; + display: block; + font: bold 81.25% 'Helvetica Neue', Helvetica, Arial, sans-serif; + margin: 1px 0; + padding: 10px 50px; + text-align: center; + text-decoration: none; + text-shadow: 0 0 5px #444; + } } diff --git a/sass/macro.scss b/sass/macro.scss index cff664f8..a3015d2a 100644 --- a/sass/macro.scss +++ b/sass/macro.scss @@ -1,93 +1,93 @@ .main-wrapper { - width: 500px; + width: 500px; } h1 { - margin-bottom: 3rem; + margin-bottom: 3rem; } .action--item { - padding-left: 8px; + padding-left: 8px; } .action--item.active, .action--item.active:hover { - background-color: white; - font-weight: bold; - color: black; - border-color: black; - z-index: 10; + background-color: white; + font-weight: bold; + color: black; + border-color: black; + z-index: 10; } .macro-settings { - border: 1px solid black; - border-top-color: #999; - z-index: 100; + border: 1px solid black; + border-top-color: #999; + z-index: 100; } .macro-settings .helper { - position: absolute; - display: block; - height: 13px; - background: #FFF; - width: 100%; - left: 0; - top: -14px; + position: absolute; + display: block; + height: 13px; + background: #FFF; + width: 100%; + left: 0; + top: -14px; } .action--item.active.callout, .macro-settings.callout { - box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.5); + box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.5); } .list-group-item .move-handle:hover { - cursor: move; + cursor: move; } .action--edit { - float: right; + float: right; } .action--edit:hover { - color: #337ab7; - cursor: pointer; + color: #337ab7; + cursor: pointer; } .action--trash { - float: right; - margin-right: 1rem; + float: right; + margin-right: 1rem; } .action--trash:hover { - color: #d9534f; - cursor: pointer; + color: #d9534f; + cursor: pointer; } .action--edit__form { - background-color: whtie; - margin-left: -.5rem; - margin-right: -15px; - margin-top: 15px; - padding-top: 15px; - border-top: 1px solid #ddd; + background-color: whtie; + margin-left: -.5rem; + margin-right: -15px; + margin-top: 15px; + padding-top: 15px; + border-top: 1px solid #ddd; } .flex-button-wrapper { - display: flex; - flex-direction: row-reverse; + display: flex; + flex-direction: row-reverse; } .flex-button { - align-self: flex-end; + align-self: flex-end; } .add-new__action-item:hover { - cursor: pointer; + cursor: pointer; } .add-new__action-item--link, .add-new__action-item--link:active, .add-new__action-item--link:hover { - text-decoration: none; - color: #337ab7; + text-decoration: none; + color: #337ab7; } diff --git a/sass/style.scss b/sass/style.scss index ed62bad2..7b51e355 100644 --- a/sass/style.scss +++ b/sass/style.scss @@ -1,191 +1,191 @@ .popover { - padding: 0; + padding: 0; - &.bottom { - > .arrow { - border-bottom-color: #000; + &.bottom { + > .arrow { + border-bottom-color: #000; - &:after { - border-bottom-color: #f7f7f7; - } + &:after { + border-bottom-color: #f7f7f7; + } + } } - } } .popover-content { - padding: 10px 24px; + padding: 10px 24px; } .popover-title { - &.menu-tabs { - padding: .5rem .5rem 0; - display: block; - } - - &.menu-button-group { - display: none; - } - - &.menu-tabs { - .nav-tabs { - position: relative; - top: 1px; + &.menu-tabs { + padding: .5rem .5rem 0; + display: block; + } + + &.menu-button-group { + display: none; + } + + &.menu-tabs { + .nav-tabs { + position: relative; + top: 1px; + } } - } } .popover-actions { - padding: 8px 14px; - margin: 0; - font-size: 14px; - background-color: #f7f7f7; - border-top: 1px solid #ebebeb; - border-radius: 0 0 5px 5px; - text-align: right; + padding: 8px 14px; + margin: 0; + font-size: 14px; + background-color: #f7f7f7; + border-top: 1px solid #ebebeb; + border-radius: 0 0 5px 5px; + text-align: right; } .select2-container { - z-index: 100000; + z-index: 100000; } .scancode--searchterm { - color: lightgray; - float: right; + color: lightgray; + float: right; } .layout-abbreviation { - font-weight: bold; - color: #FFF; - background: #333; - padding: 4px 8px; - font-family: monospace; - margin-right: .5em; + font-weight: bold; + color: #FFF; + background: #333; + padding: 4px 8px; + font-family: monospace; + margin-right: .5em; } .layout-preview img { - max-width: 100%; - margin-top: 10px; + max-width: 100%; + margin-top: 10px; } .key-editor--none__description { - p { - padding: 2rem 0; - margin: 0; - text-align: center; - } + p { + padding: 2rem 0; + margin: 0; + text-align: center; + } } .select2-item { - position: relative; - font-size: 1.5rem; + position: relative; + font-size: 1.5rem; - &.keymap-name--wrapper { - padding-left: 50px; - } + &.keymap-name--wrapper { + padding-left: 50px; + } - .layout-segment-code { - height: 2rem; - position: absolute; - left: 0; - top: 50%; - margin-top: -1rem; - } + .layout-segment-code { + height: 2rem; + position: absolute; + left: 0; + top: 50%; + margin-top: -1rem; + } } .preview-wrapper { - img { - max-width: 100%; - } + img { + max-width: 100%; + } } .global-key-setup { - &.disabled { - opacity: 0; + &.disabled { + opacity: 0; - .setting-label { - color: #999; + .setting-label { + color: #999; + } } - } } .setting-label { - &.disabled { - color: #999; - } + &.disabled { + color: #999; + } } .global-key-setup--wrapper { - position: relative; + position: relative; - .disabled-state--text { - position: absolute; - top: 50%; - margin-top: -4rem; - } + .disabled-state--text { + position: absolute; + top: 50%; + margin-top: -4rem; + } } .mouse { - &.popover-content { - padding: 10px; - display: flex; - align-items: center; - } + &.popover-content { + padding: 10px; + display: flex; + align-items: center; + } - &__action { - &--type { - .nav { - border-right: 1px solid #ccc; + &__action { + &--type { + .nav { + border-right: 1px solid #ccc; - li { - a { - border-top-right-radius: 0; - border-bottom-right-radius: 0; + li { + a { + border-top-right-radius: 0; + border-bottom-right-radius: 0; - &.selected { - font-style: italic; + &.selected { + font-style: italic; + } + } + + &.active { + a { + &.selected { + font-style: normal; + } + + &:after { + content: ''; + display: block; + position: absolute; + width: 0; + height: 0; + top: 0; + right: -4rem; + border-color: transparent transparent transparent #337ab7; + border-style: solid; + border-width: 2rem; + } + } + } + } } - } - - &.active { - a { - &.selected { - font-style: normal; - } - - &:after { - content: ''; - display: block; - position: absolute; - width: 0; - height: 0; - top: 0; - right: -4rem; - border-color: transparent transparent transparent #337ab7; - border-style: solid; - border-width: 2rem; - } - } - } } - } - } - &--config { - .btn-placeholder { - visibility: hidden; - } + &--config { + .btn-placeholder { + visibility: hidden; + } + } } - } } .help-text { - &--mouse-speed { - margin-bottom: 2rem; - font-size: .9em; - color: #666; + &--mouse-speed { + margin-bottom: 2rem; + font-size: .9em; + color: #666; - p { - margin: 0; + p { + margin: 0; + } } - } }