Skip to content

Commit 692cd7e

Browse files
Chris McLeanChris McLean
authored andcommitted
added less to bower config and converted main.css to less
1 parent a566bc5 commit 692cd7e

File tree

3 files changed

+66
-64
lines changed

3 files changed

+66
-64
lines changed

app/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!-- build:css({.tmp,app}) styles/main.css -->
1212
<link rel="stylesheet" href="vendor/bootstrap/dist/css/bootstrap.css">
1313
<link href="http://netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
14-
<link rel="stylesheet" href="styles/main.css">
14+
<link rel="stylesheet/less" type="text/css" href="styles/main.less">
1515
<link rel="stylesheet" href="styles/boilerplate.css">
1616
<link rel="stylesheet" href="vendor/leaflet-dist/leaflet.css">
1717
<link rel="stylesheet" href="vendor/leaflet.markerclusterer/dist/MarkerCluster.css">
@@ -57,6 +57,7 @@ <h2>Crunchbase search and visualization built using Angular.js and D3.</h2>
5757
<script src="vendor/leaflet.markerclusterer/dist/leaflet.markercluster.js"></script>
5858
<script src="vendor/ngInfiniteScroll/ng-infinite-scroll.js"></script>
5959
<script src="vendor/crossfilter/crossfilter.js"></script>
60+
<script src="vendor/less.js/dist/less-1.6.1.js"></script>
6061
<!-- endbuild -->
6162

6263
<!-- build:js({.tmp,app}) scripts/scripts.js -->
Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
@white: #ffffff;
2+
@bright-blue: #60beff;
3+
@pale-blue: #cdebff;
4+
@grey-blue: #4c6d84;
5+
@dark-grey: #3d3d3d;
6+
@transparent-blue: rgba(70, 84, 93, 0.5);
7+
18
@font-face {
29
font-family: 'Guilder';
310
src: url('../fonts/guilder_free-webfont.otf');
@@ -9,7 +16,7 @@
916
/* Space out content a bit */
1017
body {
1118
padding-bottom: 20px;
12-
background-color: #3d3d3d;
19+
background-color: @dark-grey;
1320
}
1421

1522
/* Everything but the jumbotron gets side spacing for mobile first views */
@@ -57,69 +64,64 @@ body {
5764
clear:both;
5865
}
5966

60-
/* BEGIN DATA SET CONTAINER */
61-
6267
.data-set-container{
63-
border-top: 1px solid #60beff;
64-
background-color: rgba(70, 84, 93, 0.5);
68+
border-top: 1px solid @bright-blue;
69+
background-color: @transparent-blue;
6570
padding: 20px;
6671
box-sizing: border-box;
67-
}
68-
69-
.data-set-container h3{
70-
font-family: 'Guilder';
71-
font-size: 53px;
72-
color: #ffffff;
73-
vertical-align: bottom;
74-
}
75-
76-
.data-set-container p{
77-
margin-top: 50px;
78-
color: #ffffff;
79-
}
8072

81-
.data-set-container .textlist{
82-
border: 1px solid #60beff;
83-
}
84-
85-
.data-set-container .form-group{
86-
margin-bottom: 0px;
87-
margin-top: 0px;
88-
}
89-
90-
.data-set-container .dataset {
91-
height: 300px;
92-
overflow: scroll;
93-
background-color: rgba(70, 84, 93, 0.5);
94-
color: #ceecff;
95-
}
96-
97-
.data-set-container tbody tr td{
98-
border-top: 1px solid #60beff;
99-
}
100-
101-
.data-set-container .input-group{
102-
display: block;
103-
}
104-
105-
.data-set-container input{
106-
border-radius: 0px;
107-
border: none;
108-
border-bottom: 1px solid #60beff;
109-
width: 100%;
110-
background-color: rgba(70, 84, 93, 0.5);
111-
color: #ffffff;
112-
}
113-
114-
.data-set-container ::-webkit-scrollbar {
115-
display: none;
116-
}
117-
118-
/* END DATA SET CONTAINER */
119-
120-
121-
.textlist.select-list .dataset {
122-
height: 251px;
73+
h3{
74+
font-family: 'Guilder';
75+
font-size: 53px;
76+
color: #ffffff;
77+
vertical-align: bottom;
78+
}
79+
80+
p{
81+
margin-top: 50px;
82+
color: @white;
83+
}
84+
85+
.textlist{
86+
border: 1px solid @bright-blue;
87+
}
88+
89+
.form-group{
90+
margin-bottom: 0px;
91+
margin-top: 0px;
92+
}
93+
94+
.textlist.select-list .dataset {
95+
height: 251px;
96+
}
97+
98+
.dataset {
99+
height: 300px;
100+
overflow: scroll;
101+
background-color: @transparent-blue;
102+
color: #ceecff;
103+
}
104+
105+
tbody tr td{
106+
border-top: 1px solid @bright-blue;
107+
}
108+
109+
.input-group{
110+
display: block;
111+
}
112+
113+
input{
114+
border-radius: 0px;
115+
border: none;
116+
border-bottom: 1px solid @bright-blue;
117+
width: 100%;
118+
background-color: @transparent-blue;
119+
color: @white;
120+
}
121+
122+
::-webkit-scrollbar {
123+
display: none;
124+
}
123125
}
124126

125127
.spacing-med {
@@ -131,8 +133,6 @@ body {
131133
clear: both;
132134
}
133135

134-
135-
136136
.remove-selected {
137137
text-align: right;
138138
}

bower.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"leaflet.markerclusterer": "*",
1616
"crossfilter": "~1.3.7",
1717
"ngInfiniteScroll": "*",
18-
"d3-cloud": "*"
18+
"d3-cloud": "*",
19+
"less.js": "~1.6.1"
1920
},
2021
"devDependencies": {
2122
"angular-mocks": "~1.2.0",

0 commit comments

Comments
 (0)