From 9d39402f2d7b426e26f0b47b7eedbab75983100c Mon Sep 17 00:00:00 2001 From: Justine Arreche <justine@neo.com> Date: Thu, 3 Oct 2013 18:00:54 -0400 Subject: [PATCH] additional styling to auth page and new icon for finished label --- assets/images/ui/cal.png | Bin 0 -> 1200 bytes assets/scripts/app/templates/auth/signin.hbs | 3 +++ assets/scripts/app/templates/repos/list.hbs | 8 +++--- assets/styles/auth.sass | 26 ++++++++++++------- assets/styles/left/list.sass | 20 ++++++++++++-- public/images/icons/clock.png | Bin 0 -> 305 bytes 6 files changed, 42 insertions(+), 15 deletions(-) create mode 100644 assets/images/ui/cal.png create mode 100644 public/images/icons/clock.png diff --git a/assets/images/ui/cal.png b/assets/images/ui/cal.png new file mode 100644 index 0000000000000000000000000000000000000000..ed89d223895fc860fb7397e874aa29a76de83212 GIT binary patch literal 1200 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s3?%0jwTl2L$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tteb3LXsBRjre|nk zYG!7rqhMrUXryldL}t2%CRV0qRz~IuP@n{~ttchUD#*nRY8Q}atCUevQedU8UtV6W zS8lAAUzDzIXlZE)GQ-G77pOwFxH7LKu|hYmSQ%!5OKNd)QD#9&W`3Rm$i&2?{L&Iz zC7??oUdSzg8=F@Q4JKfK=~pBc=o{)8fV>1#=<ADLX>KlDb#X~hD#E>34K5C;EJ)Q4 zN-fSWElLJPT$(b-ssbzLqSVBa{GyQj{2W*)24v)y<QHe;7brLfn<;4cCMIX*fdn+c zI(&VtJoAc667!N%JzZ>-fM)1rW~NvfnmW3fnOK+`nV18^-PPF9$;{Ql$jrsa(aqAx z$<Pp{*Cju>G&eP`1g19yq1OVZUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnv1?G!Lpb z1-DzwaO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zUMlyk8ki~S0(?STXHB2c z)!wmk`HJR-#@43hX_KdX|Ni~p{sS$IO_wfSdhp=E!2<{G-@o78(Ya^$?vp1@ynFX< z?dsLb7B5-1X3c_m^LOvs_3*)ij~_p-UA^YS@#9x6U*5K5%hM-M&YV8e*4#34`iwcV zX0Knn_QQt{hYue5^XE@{OY82PyMFxm@%QiF|NsBbx%*QI=n}1xAirQBmpH&+wBkby zP*;+ti(^Q|EtAtH#hMHRTrPIaozY=o%&DPZbmjklg*gKE7M+g`Y0mukF8=xLWEGu0 z1C!TVC*-RHbsuSVkpE^PQu|##w4f|=?`eMjT_^Widp@x&yd6_&YCNO<|KbN5o{KTE ZG1zx<sy%mN=>Xcs;OXk;vd$@?2>=PQ&wc;^ literal 0 HcmV?d00001 diff --git a/assets/scripts/app/templates/auth/signin.hbs b/assets/scripts/app/templates/auth/signin.hbs index 01d431a5..c15ab908 100644 --- a/assets/scripts/app/templates/auth/signin.hbs +++ b/assets/scripts/app/templates/auth/signin.hbs @@ -1,6 +1,9 @@ {{#if redirected}} <p>You need to sign in to see this page.</p> {{/if}} + +<h3>Hey, we're so glad you're here!</h3> +<h2>In order to view your repositories, please sign in.</h2> <p> <a href="#" {{action "signIn" target="Travis"}}> {{#if Travis.signingIn}} diff --git a/assets/scripts/app/templates/repos/list.hbs b/assets/scripts/app/templates/repos/list.hbs index 6b73bc71..378891fc 100644 --- a/assets/scripts/app/templates/repos/list.hbs +++ b/assets/scripts/app/templates/repos/list.hbs @@ -21,9 +21,11 @@ {{/with}} <p class="summary"> - <span class="duration_label">{{t repositories.duration}}:</span> - <abbr class="duration" {{bindAttr title="lastBuildStartedAt"}}>{{formatDuration lastBuildDuration}}</abbr>, - <span class="finished_at_label">{{t repositories.finished_at}}:</span> + <span class="duration-icon"></span><span class="duration_label">{{t repositories.duration}}:</span> + <abbr class="duration" {{bindAttr title="lastBuildStartedAt"}}>{{formatDuration lastBuildDuration}}</abbr> + </p> + <p class="summary"> + <span class="finished-icon"></span><span class="finished_at_label">{{t repositories.finished_at}}:</span> <abbr class="finished_at timeago" {{bindAttr title="lastBuildFinishedAt"}}>{{formatTime lastBuildFinishedAt}}</abbr> </p> diff --git a/assets/styles/auth.sass b/assets/styles/auth.sass index 4a73aaf6..38bb5e51 100644 --- a/assets/styles/auth.sass +++ b/assets/styles/auth.sass @@ -2,7 +2,7 @@ #auth #main - top: 100px + margin-top: 100px margin: 0 auto padding: 25px 50px height: 100px @@ -11,7 +11,6 @@ flex: none width: 300px min-width: auto - //border: 10px solid #bbb max-height: 400px @include border-radius(8px) @@ -19,6 +18,18 @@ margin-bottom: 1em color: #333 + h2 + color: #000000 + font-weight: 400 + text-align: center + margin-bottom: 40px + + h3 + font-size: 35px + color: #337389 + text-align: center + margin: 0 + p color: #334 text-align: center @@ -27,15 +38,10 @@ > a display: inline-block padding: 10px - border: 1px solid #d4d4d4 - -webkit-border-radius: 4px - -moz-border-radius: 4px - -ms-border-radius: 4px - -o-border-radius: 4px - border-radius: 4px - background-color: #c7000f + border: 0 + background-color: black font-size: 20px - color: #f6f6f6 + color: #ffffff width: 200px text-align: center diff --git a/assets/styles/left/list.sass b/assets/styles/left/list.sass index 1834be79..4857e07e 100644 --- a/assets/styles/left/list.sass +++ b/assets/styles/left/list.sass @@ -35,12 +35,28 @@ // @include border-radius(10px) .summary - margin: 5px 0 0 16px + margin: 5px 0 0 0 white-space: nowrap overflow: hidden text-overflow: ellipsis color: $color-text-light font-size: $font-size-small + + .duration-icon + display: inline-block + width: 10px + height: 10px + margin-right: 5px + background-image: inline-image('ui/clock.png') + background-size: cover + + .finished-icon + display: inline-block + width: 10px + height: 10px + margin-right: 5px + background-image: inline-image('ui/cal.png') + background-size: cover .info overflow: hidden @@ -66,7 +82,7 @@ span position: relative display: block - top: 25px + top: 45px left: -15px width: 20px height: 20px diff --git a/public/images/icons/clock.png b/public/images/icons/clock.png new file mode 100644 index 0000000000000000000000000000000000000000..03b66950f1a84007a5f747d99c5498b070a1db87 GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s3?%0jwTl3$gaDrq*M|=u{{R2Kr>AG)#EFw9 zPk#FJ>CKxr`}_Ov-Mjbe*RS*E&wu>*@$TKbKY#xG^5x5)KYxxMJ-T=A-r2Kf_xASA zoH_IT`}YqXJlMW{`<XLmu3fu!@#4iphYs!BxpVR2#sB{O1DZVTRCf{3E`^dHzhEF2 zA7F@yk$wwum#2$k2*-8bvz|;%1|lv8-^nYe_-HjVzuNs@_imK92BQa)fQ)6nrj<Zf zaoNg?il44-i!+^&6!C0V?|l``pFca>YbT5B_O`F|5_*|;dmqc9-tTd3#%?UR!e?hy dU%3C9dHYMY<(n?NxdpU~!PC{xWt~$(696T;szU$( literal 0 HcmV?d00001