Skip to content

Commit

Permalink
lab2023#21 Continues
Browse files Browse the repository at this point in the history
- Beaker added to the bottom of the dock.
- Breadcrumb position was fixed
  • Loading branch information
tayfunoziserikan committed Aug 8, 2013
1 parent 9802e61 commit 75bce46
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 6 deletions.
Binary file added source/assets/images/sprite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 20 additions & 3 deletions source/assets/stylesheets/application.css.sass
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@ body.main
.navbar-brand
font-size: 1.6em

.sprite-image
background-image: url("../images/sprite.png")

#outer-wrapper
position: absolute
top: 60px
bottom: 0
left: 20px
right: 20px
border: 1px solid rgba(0,0,0, .2)
border: 1px solid rgba(0,0,0, .15)
+border-top-left-radius($wrapper-corner-width)
+border-top-right-radius($wrapper-corner-width)
-webkit-box-shadow: 0 0 0 2px rgba(0, 0, 0, 0.03)
Expand All @@ -51,7 +54,6 @@ body.main
background-color: $sidebar-bg
width: $sidebar-width
z-index: 1

ul#dock
margin: 0 0 0 0
padding: 0
Expand Down Expand Up @@ -116,7 +118,22 @@ body.main
background-color: $body-bg
padding: 20px
left: $sidebar-width
.breadcrumb
+border-radius(0)
padding: 10px 20px
margin: -20px -20px 20px -20px

#toolbar
position: relative
top: 10px
top: 10px

#beaker
@extend .sprite-image
position: absolute
bottom: 5px
background-position: 0 0
width: 12px
height: 24px
background-size: 100px
background-repeat: no-repeat
margin-left: 33px
2 changes: 0 additions & 2 deletions source/partials/_breadcrumb.haml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
%ul.breadcrumb
%li
%i.icon-rocket.icon-circle.on
%li
%a{:href => "#"} Library
%li.active Data
4 changes: 3 additions & 1 deletion source/partials/_dock.haml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,6 @@
%a{href: '#'} Backup
%li.launcher
%i.icon-bug
%a{href: '#'} Feedback
%a{href: '#'} Feedback

#beaker

0 comments on commit 75bce46

Please sign in to comment.