Permalink
Browse files

css cleanup

  • Loading branch information...
1 parent d5961d9 commit 8a43f5ed8b56b4e26e194918bab8ab22fa8db00d @tarekziade tarekziade committed Feb 28, 2013
Showing with 32 additions and 5 deletions.
  1. +7 −3 monolith/media/app.js
  2. +1 −1 monolith/media/index.html
  3. +24 −1 monolith/media/monolith.css
View
10 monolith/media/app.js
@@ -67,16 +67,20 @@ app.directive('chart', function() {
template:
'<div><div class="chart" >' +
+ // title
+ '<h2 class="chart">{{ title }}</h2>' +
+
// y axis legend
'<div class="y_axis" id="y_axis-{{id}}"/>' +
// actual chart
'<div id="chart-{{id}}" style="height:300px; margin: 0 auto"/>' +
// legend and change button
- '<div >' +
- '<a href="#modal-{{id}}" role="button" class="btn btn-primary" data-toggle="modal">Change</a>' +
+ '<div class="legend">' +
+ '<a href="#modal-{{id}}" role="button" class="chart_btn btn" data-toggle="modal">Change</a>' +
'<div id="legend-{{id}}"></div>' +
+ '<div style="clear:both"></div>' +
'</div>' +
// modal box
@@ -94,7 +98,7 @@ app.directive('chart', function() {
'<label for="appid-{{id}}"> App id (1 to 100)</label>' +
'<input type="text" id="appid-{{id}}" value="1"/>' +
'<br/>' + // err well
- '<button type="submit" class="btn btn-primary" ng-click="draw()">Update</button>' +
+ '<button type="submit" class="chart_btn btn" ng-click="draw()">Update</button>' +
'</fieldset></form></div></div>' +
'</div>{{end}}</div>',
replace: true,
View
2 monolith/media/index.html
@@ -6,12 +6,12 @@
<link type="text/css"rel="stylesheet" href="jquery-ui.css" />
<link type="text/css" rel="stylesheet" href="bootstrap.css" />
<link type="text/css" rel="stylesheet" href="bootstrap-responsive.css" />
- <link type="text/css" rel="stylesheet" href="monolith.css" />
<link type="text/css" rel="stylesheet" href="datepicker.css" />
<link type="text/css" rel="stylesheet" href="graph.css">
<link type="text/css" rel="stylesheet" href="detail.css">
<link type="text/css" rel="stylesheet" href="legend.css">
<link type="text/css" rel="stylesheet" href="lines.css">
+ <link type="text/css" rel="stylesheet" href="monolith.css" />
<script type="text/javascript" src="lib/jquery.min.js"></script>
<script type="text/javascript" src="lib/jquery-ui.js"></script>
View
25 monolith/media/monolith.css
@@ -47,7 +47,30 @@ div.y_axis {
height: 100%;
float: right;
}
+
.rickshaw_legend {
-/* float: left;*/
+ float: right;
+ padding: 3px;
+ background: none repeat scroll 0% 0% gray;
+}
+
+.rickshaw_legend .action {
+ opacity: 1;
+ color: white;
+}
+
+h2.chart {
+ text-align: center;
+ font-size: 18px;
+ text-shadow: 0px 1px 0px rgb(255, 255, 255);
+ color: rgb(119, 119, 119);
+ font-weight: 200;
+}
+
+div.legend {
+ margin-top: 14px;
}
+a.chart_btn {
+ float: left;
+}

0 comments on commit 8a43f5e

Please sign in to comment.