diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-19 02:22:02 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-19 02:22:02 +0200 |
commit | 90584316b8f275fcad904b644676544eb0322636 (patch) | |
tree | 35ead28e8f0cdccc1771464442bb83ce5b558cc6 /css | |
parent | ded252d29e99e068ea341506129e47a05e053a24 (diff) |
add test for firstrun page
Diffstat (limited to 'css')
-rw-r--r-- | css/addnew.css | 16 | ||||
-rw-r--r-- | css/app.css | 13 | ||||
-rw-r--r-- | css/content.css (renamed from css/items.css) | 21 | ||||
-rw-r--r-- | css/firstrun.css | 41 | ||||
-rw-r--r-- | css/navigation.css (renamed from css/feeds.css) | 37 | ||||
-rw-r--r-- | css/owncloud6.css | 11 |
6 files changed, 59 insertions, 80 deletions
diff --git a/css/addnew.css b/css/addnew.css index 24cdd6000..d289ecb4e 100644 --- a/css/addnew.css +++ b/css/addnew.css @@ -31,11 +31,11 @@ } .add-new input[type=text] { - width: 120px; + width: 170px; } .add-new select { - width: 133px; + width: 170px; margin-top: 1px !important; height: 30px; background-color: #eee; @@ -46,7 +46,7 @@ box-sizing: border-box; } -.add-new input, +.add-new input, .add-new select { margin: 0 0 5px 0; display: inline-block; @@ -69,7 +69,7 @@ .add-new .action-button { width: 30px; background-position: center; - background-repeat: no-repeat; + background-repeat: no-repeat; } .add-new .back-button { @@ -80,15 +80,15 @@ .add-new .new-button { border-radius: 0; background-image: url('../img/add.svg'); - border-top-right-radius: 5px; - border-bottom-right-radius: 5px; + border-top-right-radius: 5px; + border-bottom-right-radius: 5px; } .add-new .create-button { border-radius: 0; background-image: url('../img/mark_read.svg'); - border-top-right-radius: 5px; - border-bottom-right-radius: 5px; + border-top-right-radius: 5px; + border-bottom-right-radius: 5px; } .add-new .error { diff --git a/css/app.css b/css/app.css new file mode 100644 index 000000000..bf1e695a1 --- /dev/null +++ b/css/app.css @@ -0,0 +1,13 @@ +.loading-icon { + background-image: url('../img/loading.gif'); + background-position: center; + background-repeat: no-repeat; +} + +#global-loading { + width: 100%; + height: 100%; +} + + + diff --git a/css/items.css b/css/content.css index 04cd0ac63..4c071451b 100644 --- a/css/items.css +++ b/css/content.css @@ -19,6 +19,22 @@ * */ +#first-run { + height: 100%; + width: 100%; + display: table; +} + +#first-run h1 { + color: #888888; + font-size: 1.5em; + font-weight: bold; + text-shadow: 0 1px 0 #FFFFFF; + display: table-cell; + text-align: center; + vertical-align: middle; +} + #app-content:after { content: ''; display: block; @@ -35,11 +51,6 @@ height: 100%; } -#app-content.loading { - background-image: url('../img/loading.gif'); - background-position: center; - background-repeat: no-repeat; -} #app-content.loading > ul { display: none; diff --git a/css/firstrun.css b/css/firstrun.css deleted file mode 100644 index 7467a7b2b..000000000 --- a/css/firstrun.css +++ /dev/null @@ -1,41 +0,0 @@ -/** -* ownCloud - News -* -* @author Alessandro Cosentino -* @author Bernhard Posselt -* @copyright 2013 Alessandro Cosentino cosenal@gmail.com -* @copyright 2013 Bernhard Posselt dev@bernhard-posselt.com -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. If not, see <http://www.gnu.org/licenses/>. -* -*/ - -#firstrun { - height: 100%; - margin-left: 300px; - position: relative; -} - -#firstrun .message { - color: #888888; - font-size: 1.5em; - font-weight: bold; - text-shadow: 0 1px 0 #FFFFFF; - position: absolute; - top: 50%; - text-align: center; - width: 100%; - margin-top: -0.75em; -} - diff --git a/css/feeds.css b/css/navigation.css index 9b17cd973..79f27d094 100644 --- a/css/feeds.css +++ b/css/navigation.css @@ -19,16 +19,16 @@ * */ -#undo-container { - position: fixed; - top: 0px; - width: 100%; - text-align: center; - z-index: 101; +#undo-container { + position: fixed; + top: 0px; + width: 100%; + text-align: center; + z-index: 101; line-height: 1.2; } -#undo { +#undo { z-index:101; background-color:#fc4; border:0; @@ -144,7 +144,7 @@ } .feed { - text-transform: none; + text-transform: none; } .unread-counter { @@ -182,11 +182,6 @@ button.action:hover { padding-left: 0; } -#app-navigation .rename-feed > input { - width: 155px; - height: 15px; -} - #app-navigation .folder-input { text-transform: uppercase; } @@ -205,9 +200,13 @@ button.action:hover { .rename-feed input { margin: 1px 0 0px 5px; + border-right: 1px solid #ddd; + border-radius: 2px; border-top-right-radius: 0; border-bottom-right-radius: 0; border-right: 0; + width: 208px; + height: 32px; } .rename-feed button { @@ -222,7 +221,7 @@ button.action:hover { .rename-feed .action-button { background-position: center; - background-repeat: no-repeat; + background-repeat: no-repeat; } .rename-feed .back-button { @@ -240,15 +239,21 @@ button.action:hover { } #app-navigation .ui-draggable-dragging { - width: 249px; + width: 100%; } #app-navigation .multiselect { height:20px; } +#app-navigation .progress-icon, +#app-navigation .problem-icon { + width: 299px; + line-height: 44px; +} + .progress-icon { - background-image: url('../img/loading.gif'); + background-image: url('../img/loading.gif'); } .problem-icon { diff --git a/css/owncloud6.css b/css/owncloud6.css index 5d3445cd9..1dbab96c5 100644 --- a/css/owncloud6.css +++ b/css/owncloud6.css @@ -1,13 +1,4 @@ /* Feeds */ -#app-navigation .add-new input, -#app-navigation .add-new select { - width: 170px; -} - -#app-navigation .ui-draggable-dragging { - width: 299px; -} - #app-navigation .rename-feed > input { width: 208px; height: 32px; @@ -15,7 +6,7 @@ border-radius: 2px; } -#app-navigation .progress-icon, +#app-navigation .progress-icon, #app-navigation .problem-icon { width: 299px; line-height: 44px; |