From 846b696adb9d91927dda0afd59debf921f260a28 Mon Sep 17 00:00:00 2001 From: Joao Vortmann Date: Sat, 21 Apr 2012 02:03:53 -0300 Subject: [PATCH] jvortmann: introduced glyphicons-halflings icons. Fixed fork-me image. Moved remove link to header. Removed unused images. --- public/images/edit.png | Bin 495 -> 0 bytes public/images/glyphicons-halflings.png | Bin 0 -> 4352 bytes public/images/list_items.png | Bin 202 -> 0 bytes public/images/tag.png | Bin 455 -> 0 bytes public/images/thumbs_up.png | Bin 403 -> 0 bytes public/images/trash.png | Bin 343 -> 0 bytes public/stylesheets/sass/easy_retro.scss | 93 +++++++++++++++++------- views/board.slim | 16 ++-- 8 files changed, 74 insertions(+), 35 deletions(-) delete mode 100644 public/images/edit.png create mode 100644 public/images/glyphicons-halflings.png delete mode 100644 public/images/list_items.png delete mode 100644 public/images/tag.png delete mode 100644 public/images/thumbs_up.png delete mode 100644 public/images/trash.png diff --git a/public/images/edit.png b/public/images/edit.png deleted file mode 100644 index f4413b145efe273e3d6e66d03f61145f41783d61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 495 zcmV);s@{p6bgdi$t@#g?ilnyth{$>Bbay)9J5>|^$A8So2?98cWngo6Ac~qoSLyO za7I$#k*~s4&^G#-m7t}+EUPGW*TD$PLAT)9FL-mUgDx4240|}+hovrc2@b%@AUEU^ z7PTR0lKbE?L-EA-7EKBsfOm}?-9O4FOdY!k!Do%!iZd(P6zpr{Vy=UtZNb|Dxh0<% z!dB2{9sE{)&%hygt+OAjn!yXO4eq&n=~bD!N(Q$)W$%Q~({tZPku)`?Qp)^8>ARU% z$1ZXSA5B3p2znG8d7QWMSY>4<(R9N;gSzS++cI<4z$(sMjymdkZwkI)eGv259g~X; l{|^SiAQ%Myx!|7w0|0UBB}!Yvg<=2z002ovPDHLkV1g)W)Ik6M diff --git a/public/images/glyphicons-halflings.png b/public/images/glyphicons-halflings.png new file mode 100644 index 0000000000000000000000000000000000000000..92d4445dfd0af414835467132cf50c7c38a303af GIT binary patch literal 4352 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 literal 0 HcmV?d00001 diff --git a/public/images/list_items.png b/public/images/list_items.png deleted file mode 100644 index d66c2d7fbb4c40036433e7d5a32c67ef93b42efa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xay(reLn>~)xpt6~L6L{`V$JXTlgIYB=qhl@Ejq!nhx7LZ z*?@O>`u-b_vnx0>FfcOxk;(YHQDCiMX`W|uO0)e)6EoP@@ ue7t$q!fKc4s{?`TeUMOD!ok2I!SE}|($4;%=?Y*dGkCiCxvXfylY)@ZW_+U-P&v%KXIfXks*I0m zA9HKhnjY~9<%Y~g3JCO1_QCB{ym#itpS!&G^R^fB?*(_3Y+skN|IoJ+=Pge(WE^&t iasH&XFwLHkjX~jn>gk#V^>=}Rz~JfX=d#Wzp$Py|6NiNW diff --git a/public/stylesheets/sass/easy_retro.scss b/public/stylesheets/sass/easy_retro.scss index 8f3be81..a0c572a 100644 --- a/public/stylesheets/sass/easy_retro.scss +++ b/public/stylesheets/sass/easy_retro.scss @@ -40,6 +40,11 @@ $post_it_font_size: 12px; border-bottom: 2px solid rgba($color, 0.5); &:hover { background-color: darken($color, 25%); + .icon { + &:hover { + opacity: 0.7; + } + } } } } @@ -84,10 +89,14 @@ body { @include create-box-shadow; .header { - height: 20px; - width: $post_it_side; + height: 17px; + width: $post_it_side -10px; font-weight: bold; cursor: move; + padding: 4px 4px 0 5px; + .icon { + opacity: 0; + } } .content { @@ -101,9 +110,21 @@ body { } .footer { + opacity: 0; height: 20px; - width: $post_it_side; - padding: 0 2px 0 2px; + width: $post_it_side -10px; + padding: 5px 5px 0 5px; + } + + &:hover { + .header { + .icon { + opacity: 0.3; + } + } + .footer { + opacity: 1; + } } } @@ -145,41 +166,59 @@ menu { } } -.hidden { - display : none; -} - .icon { float: left; opacity: 0.3; &:hover { opacity: 0.7; } + display: inline-block; + width: 15px; + height: 15px; + line-height: 15px; + vertical-align: text-top; + background-image: url("../images/glyphicons-halflings.png"); + background-position: 14px 14px; + background-repeat: no-repeat; + *margin-right: .3em; +} + +.delete { + background-position: -312px 0; + float: left; } -.vote { - @include flip-horizontally; - height: 25px; - width: 25px; - margin-top: 3px; - margin-right: -5px; +.vote-up { + background-position: -289px -96px; } -.list { - height: 25px; - width: 20px; - margin-top: 3px; +.vote-down { + background-position: -312px -96px; } -.edit { - height: 20px; - width: 20px; - margin-top: 7px; +.actions { + background-position: -360px -48px; } -.delete { - height: 15px; - width: 15px; - margin-top: 8px; - margin-left: 1px; +.notes { + background-position: 0 -72px; +} + +.responsible { + background-position: -168px 0; +} + +.tags { + background-position: 0 -48px; +} + +.hidden { + display : none; +} + +.fork-me-flag { + position: absolute; + top: 0; + right: 0; + border: 0; } diff --git a/views/board.slim b/views/board.slim index d5008af..2b12d01 100644 --- a/views/board.slim +++ b/views/board.slim @@ -8,6 +8,7 @@ html script{type="text/javascript" data-main="javascripts/main" src="javascripts/require.js"} body a href="http://github.com/thiagotnunes/easy-retro" + img.fork-me-flag{src="../images/fork_me.png" alt="Fork me on GitHub"} menu span.handwritten.big Add input#add_well.add.well{type="button"} @@ -17,13 +18,12 @@ html #board #base_post_it.post_it.hidden.handwritten.big .header + a.delete.icon{href="#" alt="delete"} .content{contenteditable="true"} .footer - a.hidden href="#" - img.vote.icon{src="images/thumbs_up.png" alt="vote up"} - a.hidden href="#" - img.list.icon{src="images/list_items.png" alt="list item"} - a.hidden href="#" - img.edit.icon{src="images/edit.png" alt="edit"} - a href="#" - img.delete.icon{src="images/trash.png" alt="delete"} + a.hidden.vote-up.icon{href="#" alt="vote up"} + a.hidden.vote-down.icon{href="#" alt="vote down"} + a.hidden.actions.icon{href="#" alt="actions"} + a.hidden.notes.icon{href="#" alt="notes"} + a.hidden.responsible.icon{href="#" alt="responsible"} + a.hidden.tags.icon{href="#" alt="tags"}