removed menu.css and rails.css (content merged into application.css)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@111 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index b2169fd4d96275c52b2ed812e14759b1ddd4b14e..9e76b5a0dd050771f7558bbab4888dbf45e9783b 100644 (file)
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -6,8 +6,6 @@
 <meta name="description" content="redMine" />\r
 <meta name="keywords" content="issue,bug,tracker" />\r
 <%= stylesheet_link_tag "application" %>\r
-<%= stylesheet_link_tag "menu" %>\r
-<%= stylesheet_link_tag "rails" %>\r
 <%= stylesheet_link_tag "print", :media => "print" %>\r
 <%= javascript_include_tag :defaults %>\r
 <%= javascript_include_tag 'menu' %>\r

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 9681103db196646f674c4283f1fc1f4eb2e7c482..b2fbee0d4b2b547f73e5714d41fa61181741e416 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -273,6 +273,76 @@ table.list tbody th {
     border: 1px solid #d7d7d7;\r
 }\r
 \r
+/********** Validation error messages *************/\r
+#errorExplanation {\r
+  width: 400px;\r
+  border: 0;\r
+  padding: 7px;\r
+  padding-bottom: 3px;\r
+  margin-bottom: 0px;\r
+}\r
+\r
+#errorExplanation h2 {\r
+  text-align: left;\r
+  font-weight: bold;\r
+  padding: 5px 5px 10px 26px;\r
+  font-size: 1em;\r
+  margin: -7px;\r
+  background: url(../images/alert.png) no-repeat 6px 6px;\r
+}\r
+\r
+#errorExplanation p {\r
+  color: #333;\r
+  margin-bottom: 0;\r
+  padding: 5px;\r
+}\r
+\r
+#errorExplanation ul li {\r
+  font-size: 1em;\r
+  list-style: none;\r
+  margin-left: -16px;\r
+}\r
+\r
+/*==========  Drop down menu  ==============*/\r
+div.menu {\r
+  background-color: #FFFFFF;\r
+  border-style: solid;\r
+  border-width: 1px;\r
+  border-color: #7F9DB9;\r
+  position: absolute;\r
+  top: 0px;\r
+  left: 0px;\r
+  padding: 0;\r
+  visibility: hidden;\r
+  z-index: 101;\r
+}\r
+\r
+div.menu a.menuItem {\r
+  font-size: 10px;\r
+  font-weight: normal;\r
+  line-height: 2em;\r
+  color: #000000;\r
+  background-color: #FFFFFF;\r
+  cursor: default;\r
+  display: block;\r
+  padding: 0 1em;\r
+  margin: 0;\r
+  border: 0;\r
+  text-decoration: none;\r
+  white-space: nowrap;\r
+}\r
+\r
+div.menu a.menuItem:hover, div.menu a.menuItemHighlight {\r
+  background-color: #80b0da;\r
+  color: #ffffff;\r
+}\r
+\r
+div.menu a.menuItem span.menuItemText {}\r
+\r
+div.menu a.menuItem span.menuItemArrow {\r
+  margin-right: -.75em;\r
+}\r
+\r
 /**************** Sidebar styles ****************/\r
 \r
 #subcontent{\r

diff --git a/public/stylesheets/menu.css b/public/stylesheets/menu.css
deleted file mode 100644 (file)
index b7084c2..0000000
--- a/public/stylesheets/menu.css
+++ /dev/null
@@ -1,39 +0,0 @@
-/*==========  Drop down menu  ==============*/\r
-div.menu {\r
-  background-color: #FFFFFF;\r
-  border-style: solid;\r
-  border-width: 1px;\r
-  border-color: #7F9DB9;\r
-  position: absolute;\r
-  top: 0px;\r
-  left: 0px;\r
-  padding: 0;\r
-  visibility: hidden;\r
-  z-index: 101;\r
-}\r
-\r
-div.menu a.menuItem {\r
-  font-size: 10px;\r
-  font-weight: normal;\r
-  line-height: 2em;\r
-  color: #000000;\r
-  background-color: #FFFFFF;\r
-  cursor: default;\r
-  display: block;\r
-  padding: 0 1em;\r
-  margin: 0;\r
-  border: 0;\r
-  text-decoration: none;\r
-  white-space: nowrap;\r
-}\r
-\r
-div.menu a.menuItem:hover, div.menu a.menuItemHighlight {\r
-  background-color: #80b0da;\r
-  color: #ffffff;\r
-}\r
-\r
-div.menu a.menuItem span.menuItemText {}\r
-\r
-div.menu a.menuItem span.menuItemArrow {\r
-  margin-right: -.75em;\r
-}\r

diff --git a/public/stylesheets/rails.css b/public/stylesheets/rails.css
deleted file mode 100644 (file)
index 3f7b6ca..0000000
--- a/public/stylesheets/rails.css
+++ /dev/null
@@ -1,57 +0,0 @@
-
-.fieldWithErrors {
-  padding: 2px;
-  margin: 0px;
-  background-color: red;
-  display: table;
-}
-
-#errorExplanation {
-  width: 400px;
-  border: 0;
-  padding: 7px;
-  padding-bottom: 3px;
-  margin-bottom: 0px;
-  /*background-color: #f0f0f0;*/
-}
-
-#errorExplanation h2 {
-  text-align: left;
-  font-weight: bold;
-  padding: 5px 5px 10px 26px;
-  font-size: 1em;
-  margin: -7px;
-  background: url(../images/alert.png) no-repeat 6px 6px;
-}
-
-#errorExplanation p {
-  color: #333;
-  margin-bottom: 0;
-  padding: 5px;
-}
-
-#errorExplanation ul li {
-  font-size: 1em;
-  list-style: none;
-  margin-left: -16px;
-}
-
-div.uploadStatus {
-  margin: 5px;
-}
-
-div.progressBar {
-  margin: 5px;
-}
-
-div.progressBar div.border {
-  background-color: #fff;
-  border: 1px solid grey;
-  width: 100%;
-}
-
-div.progressBar div.background {
-  background-color: #333;
-  height: 18px;
-  width: 0%;
-}