summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-24 22:14:12 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-24 22:14:12 +0300
commit420ba2119b2c63966ae60159c9216f7fdca0c469 (patch)
treeaeae755b47809b0faf2f254fa70d21385cb92466 /app/assets/stylesheets
parentbb80741c246f8c5050312ec4a770625c8e9d38ed (diff)
downloadgitlab-ce-420ba2119b2c63966ae60159c9216f7fdca0c469.tar.gz
Move star button to sidebar. Add counter to forks too
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/behaviors.scss4
-rw-r--r--app/assets/stylesheets/sections/projects.scss49
2 files changed, 24 insertions, 29 deletions
diff --git a/app/assets/stylesheets/behaviors.scss b/app/assets/stylesheets/behaviors.scss
index 034692a67e1..be4c4d07f1c 100644
--- a/app/assets/stylesheets/behaviors.scss
+++ b/app/assets/stylesheets/behaviors.scss
@@ -6,7 +6,7 @@
.js-details-container.open .content.hide { display: none; }
// Toggle between two states.
-.js-toggler-container .turn-on { display: inline-block; }
+.js-toggler-container .turn-on { display: block; }
.js-toggler-container .turn-off { display: none; }
.js-toggler-container.on .turn-on { display: none; }
-.js-toggler-container.on .turn-off { display: inline-block; }
+.js-toggler-container.on .turn-off { display: block; }
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index eecc49620fd..6757cbd30f6 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -50,22 +50,6 @@
margin-left: 10px;
font-weight: 500;
}
-
- .star .btn {
- font-weight: bold;
- line-height: 22px;
- padding: 0px;
- $margin-x: 6px;
- .toggle {
- display: inline-block;
- padding: 0px $margin-x;
- }
- .count {
- border-left: $btn-border;
- display: inline-block;
- padding: 0px $margin-x;
- }
- }
}
}
@@ -206,28 +190,39 @@ ul.nav.nav-projects-tabs {
.project-side {
.btn-block {
background-image: none;
- .btn,
- &.btn,
- &.btn-group ul.dropdown-menu {
+
+ .btn, &.btn {
+ text-align: left;
+ padding: 10px 15px;
background-color: #F1f1f1;
border-color: #EEE;
+
&:hover {
background-color: #eee;
border-color: #DDD;
}
}
- &.btn-group-justified {
- .btn {
- width: 100%;
- }
- .dropdown-toggle {
- width: 26px;
- }
+
+ .count {
+ float: right;
+ font-weight: 500;
+ text-shadow: 0 1px #FFF;
}
- ul {
+
+ &.btn-group-justified {
+ .btn {
width: 100%;
+ }
+ .dropdown-toggle {
+ width: 30px;
+ padding: 10px;
+ }
+ ul {
+ width: 100%;
+ }
}
}
+
.project-fork-icon {
float: left;
font-size: 26px;