From: Luzifr Date: Mon, 5 Mar 2012 17:23:48 +0000 (+0100) Subject: Some changes X-Git-Tag: 2.0.0_Beta_1~1250^2~2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6f93b3eb96ad7ae8e70ca6c14aa0269ee0ed0a27;p=GitHub%2FWoltLab%2FWCF.git Some changes Deleted obsolete classes; Changed sortable boards selectors; Some new selectors; --- diff --git a/wcfsetup/install/files/acp/style/wcf.css b/wcfsetup/install/files/acp/style/wcf.css index 0764b7d939..71588c9ae8 100644 --- a/wcfsetup/install/files/acp/style/wcf.css +++ b/wcfsetup/install/files/acp/style/wcf.css @@ -137,6 +137,8 @@ a[href^="mailto:"] { top: -9000px; } +/* ToDo: Margins */ + .marginTop { margin-top: 15px; } @@ -145,6 +147,35 @@ a[href^="mailto:"] { margin-bottom: 15px; } +/* ToDo: Columns */ + +.columnes-2 { + width: 45%; +} + +.columnes-3 { + width: 30%; +} + + +/* ToDo: Floated Elements */ + +/* possibly obsolete */ + +.floatContainer:after { + content: ""; + height: 0; + display: block; + clear: both; +} + +.floated { + margin-right: 5px; + margin-left: 5px; + float: left; +} + + /* ############## Containers ############## */ @@ -176,23 +207,6 @@ a[href^="mailto:"] { -/* ToDo: Floated Elements */ - -/* possibly obsolete */ - -.floatContainer:after { - content: ""; - height: 0; - display: block; - clear: both; -} - -.floated { - float: left; -} - - - /* ############## Badges ############## */ /* Globals */ @@ -3663,7 +3677,6 @@ tr .columnIcon img { /* ############## ToDo: Overlay Spinner ############## */ -.wcfDialogOverlay, .wcf-dialogOverlay { background-color: rgba(0, 0, 0, 1); opacity: .5; @@ -3675,7 +3688,7 @@ tr .columnIcon img { /* ToDo: What is that and change that class-name! */ -.overlayLoading, + .wcf-overlayLoading { background-color: rgba(255, 255, 255, 1); background-image: url('../../icon/spinner1.svg'); @@ -4460,30 +4473,29 @@ button[disabled='disabled'] { /* ############## TODO: Sortable lists ############## */ + /* TODO: Everything is working right now and looks pretty much like similar stuff. Adjust the colors, but take care when changing margins/paddings. Keep them relative to each other, otherwise you might encounter a strange behavior (in rare cases) which might lead to a situation where you will be unable to move an item properly. - Alex */ /* This is the placeholder (or ghost) which will be inserted on runtime in order to show the possible insertation point - Alex */ -.wcf-sortablePlaceholder { - background-color: rgba(255, 255, 204, 1); +.wcf-sortableListContainer .wcf-badgeYellow { border-radius: 5px; - border: 1px solid rgba(224, 224, 0, 1); margin: 3px 0; padding: 4px; } .wcf-sortableListContainer { - background-color: rgba(252, 253, 254, 1); border-radius: 0; + background-color: rgba(252, 253, 254, 1); padding: 21px; } .wcf-sortableList { list-style-position: outside; list-style-type: decimal; - min-height: 10px; /* Do not touch min-height, removing or changing it would break the whole stuff! - Alex */ margin-left: 21px; + min-height: 10px; /* Do not touch min-height, removing or changing it would break the whole stuff! - Alex */ } .wcf-sortableNode { @@ -4492,13 +4504,16 @@ button[disabled='disabled'] { .wcf-sortableNodeLabel { border-bottom: 1px solid rgba(216, 231, 245, 1); - display: block; /* Do not use anything other than block here, otherwise the sortables go crazy - Alex */ padding: 7px 7px 11px 0; + display: block; /* Do not use anything other than block here, otherwise the sortables go crazy - Alex */ } -.wcf-sortableButtonContainer { - float: right; -} + + + + + + /* ############## CSS Experiments (active) ############## */ diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index e4223f95e2..5a991687d0 100644 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -4221,7 +4221,7 @@ WCF.Sortable.List.prototype = { $('#' + this._containerID + ' .wcf-sortableList').sortable({ connectWith: '#' + this._containerID + ' .wcf-sortableList', items: 'li', - placeholder: 'wcf-sortablePlaceholder', + placeholder: 'wcf-badgeYellow', stop: $.proxy(this._save, this) }); },