Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Interview page #131

Merged
merged 29 commits into from
Feb 21, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f435a75
refactoring
fadykalo Feb 14, 2015
fca8af7
fixed issues with template and started less refactoring
fadykalo Feb 14, 2015
aefd396
cleaned interview-item
fadykalo Feb 14, 2015
172f910
still cleaning interview-item mixin
fadykalo Feb 14, 2015
2a2a63c
fixed column size for today and inner-content div
fadykalo Feb 14, 2015
fa955e5
correct col size for mixin
fadykalo Feb 14, 2015
81e3650
fist implmentation for mixin in inteview page
fadykalo Feb 14, 2015
bfffdca
added border and background to mixin logic
fadykalo Feb 14, 2015
c1ef547
separation of :hover logic
fadykalo Feb 14, 2015
e074f86
fixes to block mixin
fadykalo Feb 15, 2015
b2659d9
first draft for list-mixin
fadykalo Feb 15, 2015
a897f49
list mode renders its own HTML template
fadykalo Feb 15, 2015
d1c9837
interview list style no :hover
fadykalo Feb 15, 2015
30d661c
added list:hover
fadykalo Feb 15, 2015
1b2d1c7
report-list and hovering on interview-block
fadykalo Feb 15, 2015
41d7b8b
added smooth hover for list and blocks
fadykalo Feb 15, 2015
7f270fa
added color logic for the blocks
fadykalo Feb 15, 2015
4c1a441
two text fixes.
fadykalo Feb 16, 2015
54f752d
added billing page
fadykalo Feb 16, 2015
cbe2010
changed list size for report
fadykalo Feb 21, 2015
05e0750
added columns to list items
fadykalo Feb 21, 2015
0d98553
cleaned css since we use cols now
fadykalo Feb 21, 2015
302dae1
no need to force display block
fadykalo Feb 21, 2015
a680374
no-interview reders the correct text now
fadykalo Feb 21, 2015
4dc8f1d
added truncate class to shorten long text via css
fadykalo Feb 21, 2015
f0c171b
interview-job and interview-name truncate text now
fadykalo Feb 21, 2015
d934cb2
remove icon behave the same for list and block view
fadykalo Feb 21, 2015
a21b7be
colors are more uniform for interview and report view
fadykalo Feb 21, 2015
0fc99f2
added local less configuration to provide development configuration
fadykalo Feb 21, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion seeVcam/dashboard/templates/dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<script type="text/javascript" src="/js/dashboard.min.js"></script>
{% else %}
{# less #}
<link rel="stylesheet/less" type="text/css" href="{% static "apps/dashboard/dashboard.less" %}" />
<link rel="stylesheet/less" type="text/css" href="{% static "apps/env/local.less" %}" />
<script type="text/javascript" src="{% static "bower_components/less/dist/less-1.7.5.min.js" %}"></script>
{# app.js #}
<script type="text/javascript" data-main="{% static "" %}" src="{% static "bower_components/requirejs/require.js" %}"></script>
Expand Down
19 changes: 19 additions & 0 deletions seeVcam/static/apps/dashboard/constants.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* Colors */

@white:#fff;
@black: #000;
@orange : #D14232;
@light-orange : #FF9861;
@light-grey: #f1f1f1;
@gray : #666;
@nav-bar-grey : #cccccc;
@blue : #0071bb;
@background-grey : #eeeeee;
@silver: #bdc3c7;
@a:#dddddd;
@date-gray:#9b9b9b;
@report-color : #400065;
@green: #009145;

/* Seevcam properties */
@nav-height: 40px;
41 changes: 10 additions & 31 deletions seeVcam/static/apps/dashboard/dashboard.less
Original file line number Diff line number Diff line change
@@ -1,28 +1,10 @@
@import (inline) "../../bower_components/bootstrap/dist/css/bootstrap.css";
@import "../../bower_components/bootstrap/less/bootstrap";
@import (inline) "../../bower_components/bootstrap/dist/css/bootstrap-theme.css";

@import (inline) "../../lib/components/questions/questions.css";
@import (inline) "../../lib/components/interviews/style/fullcalendar.css";
/*
Colors
*/

@orange : #D14232;
@light-orange : #FF9861;
@light-grey: #f1f1f1;
@grey : #666;
@nav-bar-grey :#cccccc;
@blue : #0071bb;
@background-grey : #eeeeee;
@silver: #bdc3c7;

/*
Seevcam properties
*/

@report-color : #400065;

@nav-height : 40px;
@import "constants";

html, body {
font: 13px/1.4 Helvetica, arial, freesans, clean, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol";
Expand Down Expand Up @@ -50,15 +32,12 @@ hr {
display: inline-block;
}

#container {
}

#content-wrap {
min-width: 100%;
height: ~"calc(100% - 60px)";
margin-top: 20px;
}
/** Adjusting Bootstrap classes */
/* Adjusting Bootstrap classes */
.container {
/*max-width: 1000px;*/
height: 100%;
Expand All @@ -82,7 +61,7 @@ hr {
}

label {
color: #666666;
color: @gray;
}

[type=text],
Expand Down Expand Up @@ -117,12 +96,12 @@ select.form-control {
.btn-orange {
background-color : @light-orange;
border-color: @light-orange;
color: #fff;
color: @white;

&:hover, &:focus {
background-color : darken(@light-orange, 5%);
border-color : darken(@light-orange, 5%);
color: #fff;
color: @white;
}

}
Expand All @@ -132,19 +111,19 @@ select.form-control {
border-color : @silver;

&:hover, &:focus {
background-color : lighten(@grey, 5%);;
background-color : lighten(@gray, 5%);;
border-color : @silver;
}

}
.btn-blue {
background-color : @blue;
border-color : @blue;
color:#fff;
color:@white;
&:hover, &:focus {
background-color : lighten(@blue, 5%);
border-color : @blue;
color:#fff;
color:@white;
}

}
Expand All @@ -159,7 +138,7 @@ select.form-control {
}

.fc-view-container {
background: white;
background: @white;
}

.fc-button {
Expand Down
8 changes: 8 additions & 0 deletions seeVcam/static/apps/env/local.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@import "../dashboard/dashboard";

/* new definitions */

/* @overrides */

//** Load fonts from this directory.
@icon-font-path:"../../bower_components/bootstrap/fonts/";
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ define(function(require){
var interviewsApp = new InterviewApp({
interviews: window.cache.interviews.getInterviews(),
activeClock: false,
interview : true
isInterview : true
});

Utils.safelyUpdateCurrentView(interviewsApp);
Expand Down
166 changes: 166 additions & 0 deletions seeVcam/static/lib/components/interviews/style/interview-mixins.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
.block-mixin(@columns:12; @color:@blue; @back-color:@white) {

.make-md-column(@columns);

.container {
background-color: @back-color;
border-top: 7px solid @color;
border-radius: 0px;
margin-bottom: 20px;

.action-icons {
position: absolute;
right: 25px;
display: none;
cursor: pointer;
}
.header {
text-align: center;

h4 {
font-size: 20px;
font-weight: 400;
text-shadow: none;
padding: 10px;
display: inline-block;
vertical-align: bottom;
}
p {
font-size: 15px;
}
}

.interview-time {
width: 80%;
margin: 15px auto 0px auto;
border-top: 1px solid @date-gray;
padding: 5px 0px 0px 0px;
font-size: 14px;

.interview-hours {
float: right;
}

p {
display: inline-block;
}
}
.score{
font-size: 50px;
text-align: center;
}
.block-color();
}
}

.block-hover(@color:@blue) {
.container {
.smooth-hover();
&:hover {
.block-color(@white;@white;#ddd);
background-color: @color;
color: @white;
.action-icons {
display: block;
}
}
}
}

.block-compact() {
.container {
.header {
h4 {
margin-bottom: 0px;
padding: 0px;
}
p {
margin: 0px;
}
}
.interview-time {
margin-top: 0px;
}
}
}

.block-color(@name:@black;@job:@black;@time:@date-gray) {
.header {
color: @name;
p {
color: @job;
}
}
.interview-time {
border-top: 1px solid @time;
color: @time;
}
}

.list-mixin(@columns:12) {
margin-bottom: 5px;

.container {
background: @white;
line-height: 30px;

.date-group{
padding: 0px;
float: left;
border-right: 1px solid @date-gray;
}
.interview-name {
font-size: 20px;
border-right: 1px solid @date-gray;
.text-overflow();
}
.interview-job {
color: @date-gray;
.text-overflow();
}
.action-icons {
display: none;
cursor: pointer;
color: @white;
position: absolute;
right: 10px;
}
.interview-time {
text-align: center;
}
.interview-date {
text-align: center;
background: @date-gray;
color: @white;
font-size: 16px;
line-height: 31px;
}
.score{
font-size: 15px;
text-align: center;
}
}
}

.list-hover(@color:@blue) {
.container {
.smooth-hover();
&:hover {
background: @color;
& > * {
color: @white;
}
.action-icons {
display: block;
}
}
}
}

.smooth-hover(@time:0.3s){
-webkit-transition: all @time;
-moz-transition: all @time;
-ms-transition: all @time;
-o-transition: all @time;
transition: all @time;
}
Loading