From c52362918bfdbd464bdd471f76d0affef856af09 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Thu, 14 Jul 2016 22:29:25 +0200 Subject: [PATCH] Resolved some todos in .scss files --- .../files/style/bootstrap/mixin/list.scss | 5 --- wcfsetup/install/files/style/icon/icon.scss | 3 +- .../install/files/style/layout/content.scss | 24 +++++------ wcfsetup/install/files/style/ui/alert.scss | 1 - wcfsetup/install/files/style/ui/badge.scss | 1 - wcfsetup/install/files/style/ui/comment.scss | 26 ------------ wcfsetup/install/files/style/ui/dialog.scss | 5 --- wcfsetup/install/files/style/ui/dropdown.scss | 10 ++--- wcfsetup/install/files/style/ui/redactor.scss | 41 ------------------- 9 files changed, 16 insertions(+), 100 deletions(-) diff --git a/wcfsetup/install/files/style/bootstrap/mixin/list.scss b/wcfsetup/install/files/style/bootstrap/mixin/list.scss index 8b18d68aa1..fe55b0adf3 100644 --- a/wcfsetup/install/files/style/bootstrap/mixin/list.scss +++ b/wcfsetup/install/files/style/bootstrap/mixin/list.scss @@ -40,11 +40,6 @@ &:not(:last-child) { margin-right: 5px; } - - > a { - // @todo: still necessary? - /*display: inline-flex;*/ - } } /* adds a comma after each list item */ diff --git a/wcfsetup/install/files/style/icon/icon.scss b/wcfsetup/install/files/style/icon/icon.scss index ac78e57c3f..6ec19071ec 100644 --- a/wcfsetup/install/files/style/icon/icon.scss +++ b/wcfsetup/install/files/style/icon/icon.scss @@ -126,7 +126,7 @@ a > span.fa:not(.pointer) { } .icon144 { - font-size: 130px; // TODO + font-size: 130px; height: 144px; line-height: 144px; width: 144px; @@ -135,7 +135,6 @@ a > span.fa:not(.pointer) { // spinner animation .fa-spinner { animation: wcfSpinner .6s linear infinite; - // TODO: these colors shouldn't be hard-coded border: 2px solid rgb(204, 204, 204); border-top-color: rgb(79, 129, 189); border-radius: 50%; diff --git a/wcfsetup/install/files/style/layout/content.scss b/wcfsetup/install/files/style/layout/content.scss index 3b9b87f7e0..4245ca7dfe 100644 --- a/wcfsetup/install/files/style/layout/content.scss +++ b/wcfsetup/install/files/style/layout/content.scss @@ -2,7 +2,7 @@ /* content header */ .contentHeader, .boxHeadline { // deprecated - color: $wcfContentHeadlineText; // todo: rename variable + color: $wcfContentHeadlineText; .contentTitle, > h1 { // deprecated @@ -16,10 +16,10 @@ } a { - color: $wcfContentHeadlineLink; // todo: rename variable + color: $wcfContentHeadlineLink; &:hover { - color: $wcfContentHeadlineLinkActive; // todo: rename variable + color: $wcfContentHeadlineLinkActive; } } } @@ -104,15 +104,15 @@ margin-bottom: 20px; > h2 { - color: $wcfContentHeadlineText; // todo: rename variable + color: $wcfContentHeadlineText; @include wcfFontSection; a { - color: $wcfContentHeadlineLink; // todo: rename variable + color: $wcfContentHeadlineLink; &:hover { - color: $wcfContentHeadlineLinkActive; // todo: rename variable + color: $wcfContentHeadlineLinkActive; } } @@ -141,15 +141,15 @@ } .sectionTitle { - color: $wcfContentHeadlineText; // todo: rename variable + color: $wcfContentHeadlineText; @include wcfFontSection; a { - color: $wcfContentHeadlineLink; // todo: rename variable + color: $wcfContentHeadlineLink; &:hover { - color: $wcfContentHeadlineLinkActive; // todo: rename variable + color: $wcfContentHeadlineLinkActive; } } @@ -218,7 +218,7 @@ fieldset { > legend { border-bottom: 1px solid $wcfContentBorderInner; - color: $wcfContentHeadlineText; // todo: rename variable + color: $wcfContentHeadlineText; float: left; margin-bottom: 20px; padding-bottom: 10px; @@ -227,10 +227,10 @@ fieldset { @include wcfFontSection; a { - color: $wcfContentHeadlineLink; // todo: rename variable + color: $wcfContentHeadlineLink; &:hover { - color: $wcfContentHeadlineLinkActive; // todo: rename variable + color: $wcfContentHeadlineLinkActive; } } diff --git a/wcfsetup/install/files/style/ui/alert.scss b/wcfsetup/install/files/style/ui/alert.scss index 3047c59624..5af149053b 100644 --- a/wcfsetup/install/files/style/ui/alert.scss +++ b/wcfsetup/install/files/style/ui/alert.scss @@ -89,7 +89,6 @@ } /* inline infos */ -/* TODO: use other colors */ .innerInfo { background-color: $wcfStatusInfoBackground; color: $wcfStatusInfoText; diff --git a/wcfsetup/install/files/style/ui/badge.scss b/wcfsetup/install/files/style/ui/badge.scss index e07665c8dc..290c17b34b 100644 --- a/wcfsetup/install/files/style/ui/badge.scss +++ b/wcfsetup/install/files/style/ui/badge.scss @@ -6,7 +6,6 @@ a.badge { display: inline-block; padding: 2px 6px; position: relative; - text-shadow: none !important; /* necessary to avoid ugly text shadows in comment lists; @todo: better solution without "!important" */ vertical-align: middle; white-space: nowrap; word-wrap: normal; diff --git a/wcfsetup/install/files/style/ui/comment.scss b/wcfsetup/install/files/style/ui/comment.scss index c58e3df142..1a912e5014 100644 --- a/wcfsetup/install/files/style/ui/comment.scss +++ b/wcfsetup/install/files/style/ui/comment.scss @@ -50,29 +50,3 @@ padding: 10px 20px 0 20px; } } - -/* -.commentContent { - > .containerHeadline { - margin-bottom: 5px; - } - - & + .commentOptionContainer { - margin-top: 10px; - } -} - -.commentResponseList { - margin-top: 10px; -} - -.commentResponse { - // TODO: border-top: 1px solid $wcfContentBorder; - padding: 10px 0; -} - -.commentOptionContainer { - // TODO: border-top: 1px solid $wcfContentBorder; - padding-top: 10px; -} -*/ \ No newline at end of file diff --git a/wcfsetup/install/files/style/ui/dialog.scss b/wcfsetup/install/files/style/ui/dialog.scss index a90e163895..eacde3de8b 100644 --- a/wcfsetup/install/files/style/ui/dialog.scss +++ b/wcfsetup/install/files/style/ui/dialog.scss @@ -186,11 +186,6 @@ display: none; } -/* package (un-)installation (todo: obsolete?) */ -#packageInstallationDialogContainer > .boxHeadline { - margin-top: 0; -} - .spinner { background-color: rgb(255, 255, 255); border: 1px solid rgb(204, 204, 204); diff --git a/wcfsetup/install/files/style/ui/dropdown.scss b/wcfsetup/install/files/style/ui/dropdown.scss index cbc849d732..52d88c92f3 100644 --- a/wcfsetup/install/files/style/ui/dropdown.scss +++ b/wcfsetup/install/files/style/ui/dropdown.scss @@ -18,7 +18,7 @@ padding: 4px 7px; > span.active:after { - content: "\f0d7"; // @TODO: use a variable instead + content: $fa-var-caret-down; font-family: FontAwesome; font-size: 14px; margin-left: 7px; @@ -64,7 +64,7 @@ word-wrap: normal; &.active::after { - content: "\f0d7"; // TODO: use a variable instead + content: $fa-var-caret-down; font-family: FontAwesome; font-size: 14px; margin-left: 7px; @@ -91,7 +91,7 @@ word-wrap: normal; &.active::after { - content: "\f0d7"; // @TODO: use a variable instead + content: $fa-var-caret-down; font-family: FontAwesome; font-size: 14px; margin-left: 7px; @@ -101,10 +101,6 @@ } &.dropdownOpen { - .dropdownToggle { - //color: @wcfPageLinkHoverColor; - } - .dropdownMenu { display: block; } diff --git a/wcfsetup/install/files/style/ui/redactor.scss b/wcfsetup/install/files/style/ui/redactor.scss index 80dd51192e..429bdc9cac 100644 --- a/wcfsetup/install/files/style/ui/redactor.scss +++ b/wcfsetup/install/files/style/ui/redactor.scss @@ -108,47 +108,6 @@ vertical-align: top; } } - - .TODO_codeBox { - overflow: hidden; - position: relative; - - .redactorEditCodeBox { - background-color: rgba(255, 255, 255, .8); - bottom: 0; - left: 0; - opacity: 0; - position: absolute; - right: 0; - text-align: center; - top: 0; - transition: opacity .12s linear; - z-index: 200; - - > div { - cursor: pointer; - left: 50%; - padding: 1em 3em; - position: absolute; - top: 50%; - transform: translate(-50%, -50%); - } - } - - &:hover .redactorEditCodeBox { - opacity: 1; - } - - ol { - margin-bottom: 0; - margin-top: 0; - } - } - - &.TODO_msie .quoteBox { - /* resets 'hasLayout' causing IE to display resize handle and wonky editing behavior */ - min-height: 0; - } } .redactor-dropdown { -- 2.20.1