summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/assets/stylesheets/buttons.scss141
-rw-r--r--app/assets/stylesheets/commits.css.scss23
-rw-r--r--app/assets/stylesheets/common.scss1
-rw-r--r--app/assets/stylesheets/projects.css.scss56
-rw-r--r--app/assets/stylesheets/style.scss57
-rw-r--r--app/views/layouts/admin.html.haml1
-rw-r--r--app/views/layouts/application.html.haml1
-rw-r--r--app/views/layouts/devise.html.haml1
-rw-r--r--app/views/layouts/profile.html.haml1
-rw-r--r--app/views/layouts/project.html.haml1
10 files changed, 147 insertions, 136 deletions
diff --git a/app/assets/stylesheets/buttons.scss b/app/assets/stylesheets/buttons.scss
new file mode 100644
index 00000000000..174c9d61a89
--- /dev/null
+++ b/app/assets/stylesheets/buttons.scss
@@ -0,0 +1,141 @@
+/* Buttons */
+.grey-button{
+ border-radius: 5px;
+ font-size: 12px;
+ font-weight: bold;
+ padding: 5px 17px;
+ border: 1px solid #999;
+ color: #666;
+ display: inline-block;
+ box-shadow: 0 1px 2px rgba(0,0,0,.3);
+ background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.192, #fff), to(#f4f4f4));
+ background-image: -webkit-linear-gradient(#fff 19.2%, #f4f4f4);
+ background-image: -moz-linear-gradient(#fff 19.2%, #f4f4f4);
+ background-image: -o-linear-gradient(#fff 19.2%, #f4f4f4);
+}
+
+.red-button{
+ border-radius: 5px;
+ font-size: 12px;
+ font-weight: bold;
+ padding: 5px 17px;
+ border: 1px solid #999;
+ color: #666;
+ display: inline-block;
+ box-shadow: 0 1px 2px rgba(0,0,0,.3);
+ background: #D12F19;
+ color: white;
+}
+
+.positive-button{
+ border-radius: 5px;
+ font-size: 12px;
+ font-weight: bold;
+ padding: 5px 17px;
+ border: 1px solid #999;
+ color: #666;
+ display: inline-block;
+ box-shadow: 0 1px 2px rgba(0,0,0,.3);
+ background: #4A2;
+ color: white;
+}
+
+
+.lbutton,
+.lite_button {
+ display:block;
+ float:left;
+ margin: 0px 5px 0px 0px;
+ padding:5px 10px;
+
+ font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;
+ border:1px solid #D3D3D3;
+ background:white;
+ font-size:12px !important;
+ line-height:130%;
+ text-decoration:none;
+ font-weight:bold;
+ color:#565656;
+ cursor:pointer;
+
+ &:hover {
+ border:1px solid #C2E1EF;
+ color: #0099FF;
+ }
+
+ &.hm {
+ margin: 0px 0px;
+ }
+
+ &.vm {
+ margin: 5px 0px;
+ }
+}
+
+a.button, input.button {
+ font-weight: bold;
+ padding: 10px 20px;
+ text-align: center;
+ display: inline-block;
+ border-radius: 5px;
+ color: #578E91;
+ font-size: 12px;
+ text-transform: uppercase;
+ border: 1px solid #8CE2E6;
+ background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #dbf5f6), to(#c5eef0));
+ background-image: -webkit-linear-gradient(#dbf5f6 79.4%, #c5eef0);
+ background-image: -moz-linear-gradient(#dbf5f6 79.4%, #c5eef0);
+ background-image: -o-linear-gradient(#dbf5f6 79.4%, #c5eef0);
+}
+
+input.button{margin-bottom: 1.5em}
+
+.button:hover {color: rgba(0,0,0,.8)}
+
+.button.green {margin-right: 0; }
+
+.button.yellow{
+ color: #908054;
+ border-color: #DDCDA1;
+ background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #FFEFC3), to(#F3E3B7));
+ background-image: -webkit-linear-gradient(#FFEFC3 79.4%, #F3E3B7);
+ background-image: -moz-linear-gradient(#FFEFC3 79.4%, #F3E3B7);
+ background-image: -o-linear-gradient(#FFEFC3 79.4%, #F3E3B7);
+}
+
+.button.blue{
+ color: #417E97;
+ border-color: #b2cdec;
+ background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #dbe8f6), to(#c7daf1));
+ background-image: -webkit-linear-gradient(#dbe8f6 79.4%, #c7daf1);
+ background-image: -moz-linear-gradient(#dbe8f6 79.4%, #c7daf1);
+ background-image: -o-linear-gradient(#dbe8f6 79.4%, #c7daf1);
+}
+
+.button-small{ text-shadow: none; padding: 4px 10px; }
+.button-green{background: #A6B807; color: white}
+
+
+.commit-button{
+ background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.192, #fff), to(#f4f4f4));
+ background-image: -webkit-linear-gradient(#fff 19.2%, #f4f4f4);
+ background-image: -moz-linear-gradient(#fff 19.2%, #f4f4f4);
+ background-image: -o-linear-gradient(#fff 19.2%, #f4f4f4);
+ box-shadow: 0 -1px 0 white inset;
+ display: block;
+ border: 1px solid #eee;
+ border-radius: 5px;
+ margin-bottom: 2px;
+ position: relative;
+ padding-right: 20px !important;
+}
+
+.commit-button i{
+ background: url('images.png') no-repeat -138px -27px;
+ width: 6px;
+ height: 9px;
+ float: right;
+ position: absolute;
+ top: 6px;
+ right: 5px;
+}
diff --git a/app/assets/stylesheets/commits.css.scss b/app/assets/stylesheets/commits.css.scss
index b1fa9c1827c..ffc87efc00a 100644
--- a/app/assets/stylesheets/commits.css.scss
+++ b/app/assets/stylesheets/commits.css.scss
@@ -4,29 +4,6 @@ body.project-page.commits-page .commit-info data{
padding: 4px 10px;
font-size: 11px;
}
-body.project-page.commits-page .commit-info data.commit-button{
- background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.192, #fff), to(#f4f4f4));
- background-image: -webkit-linear-gradient(#fff 19.2%, #f4f4f4);
- background-image: -moz-linear-gradient(#fff 19.2%, #f4f4f4);
- background-image: -o-linear-gradient(#fff 19.2%, #f4f4f4);
- box-shadow: 0 -1px 0 white inset;
- display: block;
- border: 1px solid #eee;
- border-radius: 5px;
- margin-bottom: 2px;
- position: relative;
- padding-right: 20px;
-}
-
-body.project-page.commits-page .commit-button i{
- background: url('images.png') no-repeat -138px -27px;
- width: 6px;
- height: 9px;
- float: right;
- position: absolute;
- top: 6px;
- right: 5px;
-}
body.project-page.commits-page .commits-date {display: block; width: 100%; margin-bottom: 20px}
body.project-page.commits-page .commits-date .data {padding: 0}
body.project-page.commits-page a.commit{padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 44538045171..518d56f0b0d 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -114,3 +114,4 @@ a {
@import "dashboard.scss";
@import "tree.scss";
@import "tags.scss";
+@import "buttons.scss";
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index 4e749ef9d52..18d8b96d08f 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -122,37 +122,6 @@ input.ssh_project_url {
}
-/** Buttons **/
-.lbutton,
-.lite_button {
- display:block;
- float:left;
- margin: 0px 5px 0px 0px;
- padding:5px 10px;
-
- font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;
- border:1px solid #D3D3D3;
- background:white;
- font-size:12px !important;
- line-height:130%;
- text-decoration:none;
- font-weight:bold;
- color:#565656;
- cursor:pointer;
-
- &:hover {
- border:1px solid #C2E1EF;
- color: #0099FF;
- }
-
- &.hm {
- margin: 0px 0px;
- }
-
- &.vm {
- margin: 5px 0px;
- }
-}
#user_projects_limit{
width: 60px;
@@ -449,31 +418,6 @@ h4.dash-tabs {
}
-.red-button{
- border-radius: 5px;
- font-size: 12px;
- font-weight: bold;
- padding: 5px 17px;
- border: 1px solid #999;
- color: #666;
- display: inline-block;
- box-shadow: 0 1px 2px rgba(0,0,0,.3);
- background: #D12F19;
- color: white;
-}
-
-.positive-button{
- border-radius: 5px;
- font-size: 12px;
- font-weight: bold;
- padding: 5px 17px;
- border: 1px solid #999;
- color: #666;
- display: inline-block;
- box-shadow: 0 1px 2px rgba(0,0,0,.3);
- background: #4A2;
- color: white;
-}
.dark_scheme_box {
diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss
index 4bb5fef9269..1c0ce0f1e8f 100644
--- a/app/assets/stylesheets/style.scss
+++ b/app/assets/stylesheets/style.scss
@@ -130,64 +130,7 @@ table thead .image{width:100px}
.listed_items tr.odd:hover{background-color:#FFFFCF}
/* eo Tables */
-/* Buttons */
-.grey-button{
- border-radius: 5px;
- font-size: 12px;
- font-weight: bold;
- padding: 5px 17px;
- border: 1px solid #999;
- color: #666;
- display: inline-block;
- box-shadow: 0 1px 2px rgba(0,0,0,.3);
- background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #f7f7f7), to(#d5d5d5));
- background-image: -webkit-linear-gradient(#f7f7f7 7.6%, #d5d5d5);
- background-image: -moz-linear-gradient(#f7f7f7 7.6%, #d5d5d5);
- background-image: -o-linear-gradient(#f7f7f7 7.6%, #d5d5d5);
-}
-
-a.button, input.button {
- font-weight: bold;
- padding: 10px 20px;
- text-align: center;
- display: inline-block;
- border-radius: 5px;
- color: #578E91;
- font-size: 12px;
- text-transform: uppercase;
- border: 1px solid #8CE2E6;
- background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #dbf5f6), to(#c5eef0));
- background-image: -webkit-linear-gradient(#dbf5f6 79.4%, #c5eef0);
- background-image: -moz-linear-gradient(#dbf5f6 79.4%, #c5eef0);
- background-image: -o-linear-gradient(#dbf5f6 79.4%, #c5eef0);
-}
-
-input.button{margin-bottom: 1.5em}
-
-.button:hover {color: rgba(0,0,0,.8)}
-
-.button.green {margin-right: 0; }
-
-.button.yellow{
- color: #908054;
- border-color: #DDCDA1;
- background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #FFEFC3), to(#F3E3B7));
- background-image: -webkit-linear-gradient(#FFEFC3 79.4%, #F3E3B7);
- background-image: -moz-linear-gradient(#FFEFC3 79.4%, #F3E3B7);
- background-image: -o-linear-gradient(#FFEFC3 79.4%, #F3E3B7);
-}
-
-.button.blue{
- color: #417E97;
- border-color: #b2cdec;
- background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #dbe8f6), to(#c7daf1));
- background-image: -webkit-linear-gradient(#dbe8f6 79.4%, #c7daf1);
- background-image: -moz-linear-gradient(#dbe8f6 79.4%, #c7daf1);
- background-image: -o-linear-gradient(#dbe8f6 79.4%, #c7daf1);
-}
-.button-small{ text-shadow: none; padding: 4px 10px; }
-.button-green{background: #A6B807; color: white}
/* eo Buttons */
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 2b3188056f9..72b6222f5c2 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -1,6 +1,7 @@
!!!
%html
%head
+ %meta{:charset => "utf-8"}
%title
GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
= favicon_link_tag 'favicon.ico'
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e86e5c74fa4..2c03916a9ac 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,6 +1,7 @@
!!!
%html
%head
+ %meta{:charset => "utf-8"}
%title
GitLab
= favicon_link_tag 'favicon.ico'
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index 882195ae58d..06db473955f 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -1,6 +1,7 @@
!!!
%html
%head
+ %meta{:charset => "utf-8"}
%title
GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
= favicon_link_tag 'favicon.ico'
diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml
index 6eeecb294be..9c561d4c0b7 100644
--- a/app/views/layouts/profile.html.haml
+++ b/app/views/layouts/profile.html.haml
@@ -1,6 +1,7 @@
!!!
%html
%head
+ %meta{:charset => "utf-8"}
%title
GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
= favicon_link_tag 'favicon.ico'
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index a87b3400812..3b915239752 100644
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -1,6 +1,7 @@
!!!
%html
%head
+ %meta{:charset => "utf-8"}
%title
GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
= favicon_link_tag 'favicon.ico'
View Lorry Controller Status