summaryrefslogtreecommitdiffstats
path: root/css
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-05-23 01:37:39 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-05-23 01:37:39 +0200
commitdca8431750afc77f132afa1d96018ba78d7e845b (patch)
tree7c335aa1938c074551ad83fbe52768c9d85adb97 /css
parente5fb131283de10c797a33bac668876f6c198e81f (diff)
get rid of addnew css
Diffstat (limited to 'css')
-rw-r--r--css/addnew.css96
-rw-r--r--css/app.css41
-rw-r--r--css/content.css20
-rw-r--r--css/navigation.css108
-rw-r--r--css/settings.css1
5 files changed, 113 insertions, 153 deletions
diff --git a/css/addnew.css b/css/addnew.css
deleted file mode 100644
index a8cc00daf..000000000
--- a/css/addnew.css
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * ownCloud - News
- *
- * @author Bernhard Posselt
- * @copyright 2012 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/>.
- *
- */
-
-
-
-.add-new:hover a.opened {
- background-color: transparent !important;
-}
-
-.add-new-popup {
- display: none;
- padding: 15px 10px;
-}
-
-.add-new input[type=text] {
- width: 170px;
-}
-
-.add-new select {
- width: 170px;
- margin-top: 1px !important;
- height: 30px;
- background-color: #eee;
-}
-
-.add-new input {
- margin-top: 15px;
- box-sizing: border-box;
-}
-
-.add-new input,
-.add-new select {
- margin: 0 0 5px 0;
- display: inline-block;
- float: left;
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
- border-right: 0;
-}
-
-.add-new button {
- margin: 0 0 5px 0;
- display: inline-block;
- float: left;
- border-bottom-left-radius: 0;
- border-top-left-radius: 0;
- height: 30px !important;
- margin-top: 1px;
-}
-
-.add-new .action-button {
- width: 30px;
- background-position: center;
- background-repeat: no-repeat;
-}
-
-.add-new .back-button {
- border-radius: 0;
- background-image: url('../img/delete.svg');
-}
-
-.add-new .new-button {
- border-radius: 0;
- background-image: url('../img/add.svg');
- 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;
-}
-
-.add-new .error {
- padding: 0 0 10px 0;
-} \ No newline at end of file
diff --git a/css/app.css b/css/app.css
index bf1e695a1..b8ca4ec64 100644
--- a/css/app.css
+++ b/css/app.css
@@ -1,3 +1,12 @@
+/**
+ * ownCloud - News
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @copyright Bernhard Posselt 2014
+ */
.loading-icon {
background-image: url('../img/loading.gif');
background-position: center;
@@ -9,5 +18,37 @@
height: 100%;
}
+#undo-container {
+ position: fixed;
+ top: 0px;
+ width: 100%;
+ text-align: center;
+ z-index: 101;
+ line-height: 1.2;
+}
+
+#undo {
+ z-index:101;
+ background-color:#fc4;
+ border:0;
+ padding:0 .7em .3em;
+ display:none;
+ position: relative;
+ top:0;
+ -moz-border-radius-bottomleft:1em;
+ -webkit-border-bottom-left-radius:1em;
+ border-bottom-left-radius:1em;
+ -moz-border-radius-bottomright:1em;
+ -webkit-border-bottom-right-radius:1em;
+ border-bottom-right-radius:1em;
+}
+
+#undo a {
+ font-weight: bold;
+}
+
+#undo a:hover {
+ text-decoration: underline;
+}
diff --git a/css/content.css b/css/content.css
index 8cbcafa08..d8f97f217 100644
--- a/css/content.css
+++ b/css/content.css
@@ -1,24 +1,12 @@
/**
* ownCloud - News
*
- * @author Bernhard Posselt
- * @copyright 2012 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/>.
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
*
+ * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @copyright Bernhard Posselt 2014
*/
-
#first-run {
height: 100%;
width: 100%;
diff --git a/css/navigation.css b/css/navigation.css
index 574251ce9..111f90e0f 100644
--- a/css/navigation.css
+++ b/css/navigation.css
@@ -1,57 +1,85 @@
/**
* ownCloud - News
*
- * @author Bernhard Posselt
- * @copyright 2012 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/>.
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
*
+ * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @copyright Bernhard Posselt 2014
*/
+.add-new:hover a.opened {
+ background-color: transparent !important;
+}
-#undo-container {
- position: fixed;
- top: 0px;
- width: 100%;
- text-align: center;
- z-index: 101;
- line-height: 1.2;
+.add-new-popup {
+ display: none;
+ padding: 15px 10px;
}
-#undo {
- z-index:101;
- background-color:#fc4;
- border:0;
- padding:0 .7em .3em;
- display:none;
- position: relative;
- top:0;
- -moz-border-radius-bottomleft:1em;
- -webkit-border-bottom-left-radius:1em;
- border-bottom-left-radius:1em;
- -moz-border-radius-bottomright:1em;
- -webkit-border-bottom-right-radius:1em;
- border-bottom-right-radius:1em;
+.add-new input[type=text] {
+ width: 170px;
}
-#undo a {
- font-weight: bold;
+.add-new select {
+ width: 170px;
+ margin-top: 1px !important;
+ height: 30px;
+ background-color: #eee;
+}
+
+.add-new input {
+ margin-top: 15px;
+ box-sizing: border-box;
+}
+
+.add-new input,
+.add-new select {
+ margin: 0 0 5px 0;
+ display: inline-block;
+ float: left;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+ border-right: 0;
+}
+
+.add-new button {
+ margin: 0 0 5px 0;
+ display: inline-block;
+ float: left;
+ border-bottom-left-radius: 0;
+ border-top-left-radius: 0;
+ height: 30px !important;
+ margin-top: 1px;
}
-#undo a:hover {
- text-decoration: underline;
+.add-new .action-button {
+ width: 30px;
+ background-position: center;
+ background-repeat: no-repeat;
}
+.add-new .back-button {
+ border-radius: 0;
+ background-image: url('../img/delete.svg');
+}
+
+.add-new .new-button {
+ border-radius: 0;
+ background-image: url('../img/add.svg');
+ 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;
+}
+
+.add-new .error {
+ padding: 0 0 10px 0;
+}
.starred-icon {
background-image: url('../img/starred.png');
diff --git a/css/settings.css b/css/settings.css
index 7c56c1a95..04d0d4e18 100644
--- a/css/settings.css
+++ b/css/settings.css
@@ -7,7 +7,6 @@
* @author Bernhard Posselt <dev@bernhard-posselt.com>
* @copyright Bernhard Posselt 2014
*/
-
#app-settings input[type=file] {
opacity:0;
z-index:1001;