Commit c6c3d769 by Galen Frechette

fixes title of course in dashboard to accept very long course names, improves…

fixes title of course in dashboard to accept very long course names, improves various other UI elemnts in the dashboard
parent 00e366e9
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
@include box-sizing(border-box); @include box-sizing(border-box);
@include border-radius(3px); @include border-radius(3px);
display: block; display: block;
//font: normal 1.2rem/1.6rem $sans-serif; font: normal 1.2rem/1.6rem $sans-serif;
letter-spacing: 1px; letter-spacing: 1px;
padding: 10px 0px; padding: 10px 0px;
text-transform: uppercase; text-transform: uppercase;
...@@ -117,7 +117,6 @@ ...@@ -117,7 +117,6 @@
@include box-sizing(border-box); @include box-sizing(border-box);
color: darken($blue, 20%); color: darken($blue, 20%);
display: block; display: block;
//font: normal 1.2rem/1.6rem $sans-serif;
letter-spacing: 1px; letter-spacing: 1px;
padding: 10px 0px 8px; padding: 10px 0px 8px;
text-transform: uppercase; text-transform: uppercase;
......
...@@ -9,10 +9,13 @@ ...@@ -9,10 +9,13 @@
width: flex-grid(3); width: flex-grid(3);
header.profile { header.profile {
h1.user-name { @include background-image(linear-gradient(-90deg, rgb(255,255,255), rgb(245,245,245)));
border: 1px solid rgb(200,200,200); border: 1px solid rgb(200,200,200);
@include border-radius(4px); @include border-radius(4px);
@include box-sizing(border-box); @include box-sizing(border-box);
width: flex-grid(12);
h1.user-name {
color: $base-font-color; color: $base-font-color;
font: 700 1.2em/1.2em $sans-serif; font: 700 1.2em/1.2em $sans-serif;
margin: 0px; margin: 0px;
...@@ -21,7 +24,7 @@ ...@@ -21,7 +24,7 @@
text-wrap: nowrap; text-wrap: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
text-transform: none; text-transform: none;
width: flex-grid(12); }
} }
.user-info { .user-info {
...@@ -29,10 +32,10 @@ ...@@ -29,10 +32,10 @@
padding: 0px 10px; padding: 0px 10px;
> ul { > ul {
background: rgb(250,250,250); background: rgb(252,252,252);
border: 1px solid rgb(200,200,200); border: 1px solid rgb(200,200,200);
border-top: none; border-top: none;
@include border-bottom-radius(4px); //@include border-bottom-radius(4px);
@include box-sizing(border-box); @include box-sizing(border-box);
@include box-shadow(inset 0 0 3px 0 rgba(0,0,0, 0.15)); @include box-shadow(inset 0 0 3px 0 rgba(0,0,0, 0.15));
@include clearfix; @include clearfix;
...@@ -90,7 +93,6 @@ ...@@ -90,7 +93,6 @@
} }
} }
} }
}
.my-courses { .my-courses {
float: left; float: left;
...@@ -136,13 +138,10 @@ ...@@ -136,13 +138,10 @@
} }
.my-course { .my-course {
background: rgb(250,250,250);
@include background-image(linear-gradient(-90deg, rgb(253,253,253), rgb(240,240,240)));
border: 1px solid rgb(190,190,190);
@include border-radius(3px); @include border-radius(3px);
@include box-shadow(0 1px 8px 0 rgba(0,0,0, 0.1), inset 0 -1px 0 0 rgba(255,255,255, 0.8), inset 0 1px 0 0 rgba(255,255,255, 0.8)); @include box-shadow(0 1px 8px 0 rgba(0,0,0, 0.1), inset 0 -1px 0 0 rgba(255,255,255, 0.8), inset 0 1px 0 0 rgba(255,255,255, 0.8));
@include box-sizing(border-box);
@include clearfix; @include clearfix;
height: 120px;
margin-right: flex-gutter(); margin-right: flex-gutter();
margin-bottom: 25px; margin-bottom: 25px;
overflow: hidden; overflow: hidden;
...@@ -158,12 +157,15 @@ ...@@ -158,12 +157,15 @@
background: rgb(225,225,225); background: rgb(225,225,225);
background-size: cover; background-size: cover;
background-position: center center; background-position: center center;
border-right: 1px solid rgb(150,150,150); border: 1px solid rgb(120,120,120);
@include border-left-radius(3px); @include border-left-radius(3px);
@include box-shadow(inset 0 0 0 1px rgba(255,255,255, 0.6), 1px 0 0 0 rgba(255,255,255, 0.8)); @include box-shadow(inset 0 0 0 1px rgba(255,255,255, 0.6), 1px 0 0 0 rgba(255,255,255, 0.8));
@include box-sizing(border-box);
float: left; float: left;
height: 120px; height: 100%;
max-height: 100%;
margin: 0px; margin: 0px;
overflow: hidden;
position: relative; position: relative;
@include transition(all, 0.15s, linear); @include transition(all, 0.15s, linear);
width: 200px; width: 200px;
...@@ -171,7 +173,6 @@ ...@@ -171,7 +173,6 @@
.shade { .shade {
@include background-image(linear-gradient(-90deg, rgba(255,255,255, 0.3) 0%, @include background-image(linear-gradient(-90deg, rgba(255,255,255, 0.3) 0%,
rgba(0,0,0, 0.3) 100%)); rgba(0,0,0, 0.3) 100%));
@include border-radius(4px);
bottom: 0px; bottom: 0px;
content: ""; content: "";
display: block; display: block;
...@@ -211,7 +212,15 @@ ...@@ -211,7 +212,15 @@
} }
.info { .info {
background: rgb(250,250,250);
@include background-image(linear-gradient(-90deg, rgb(253,253,253), rgb(240,240,240)));
@include box-sizing(border-box);
border: 1px solid rgb(190,190,190);
border-left: none;
@include border-right-radius(3px);
left: 201px; left: 201px;
height: 100%;
max-height: 100%;
padding: 0px 10px; padding: 0px 10px;
position: absolute; position: absolute;
right: 0px; right: 0px;
...@@ -219,6 +228,7 @@ ...@@ -219,6 +228,7 @@
z-index: 2; z-index: 2;
> hgroup { > hgroup {
@include clearfix;
border-bottom: 1px solid rgb(210,210,210); border-bottom: 1px solid rgb(210,210,210);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6)); @include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
padding: 12px 0px; padding: 12px 0px;
...@@ -236,7 +246,8 @@ ...@@ -236,7 +246,8 @@
@include inline-block; @include inline-block;
margin-right: 10px; margin-right: 10px;
padding: 5px 10px; padding: 5px 10px;
vertical-align: middle;
float: left;
&:hover { &:hover {
color: $blue; color: $blue;
...@@ -245,16 +256,17 @@ ...@@ -245,16 +256,17 @@
} }
h3 { h3 {
@include inline-block; display: block;
margin-bottom: 0px; margin-bottom: 0px;
vertical-align: middle; overflow: hidden;
padding-top: 2px;
text-overflow: ellipsis;
white-space: nowrap;
a { a {
color: $base-font-color; color: $base-font-color;
font-weight: 700; font-weight: 700;
text-shadow: 0 1px rgba(255,255,255, 0.6); text-shadow: 0 1px rgba(255,255,255, 0.6);
text-overflow: ellipsis;
white-space: nowrap;
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<section class="profile-sidebar"> <section class="profile-sidebar">
<header class="profile"> <header class="profile">
<h1 class="user-name">${ user.username }</h1> <h1 class="user-name">${ user.username }</h1>
</header>
<section class="user-info"> <section class="user-info">
<ul> <ul>
<li> <li>
...@@ -21,7 +22,6 @@ ...@@ -21,7 +22,6 @@
</li> </li>
</ul> </ul>
</section> </section>
</header>
</section> </section>
<section class="my-courses"> <section class="my-courses">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment