Skip to content

Commit

Permalink
added json output
Browse files Browse the repository at this point in the history
  • Loading branch information
samueldelesque committed Dec 2, 2014
1 parent 63eb757 commit b2e3f70
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 4 deletions.
2 changes: 1 addition & 1 deletion app/css/index.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 13 additions & 2 deletions app/css/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ a:hover{
color: #111;
width: 100%;
margin: 5px 0;
padding: 10px 20px;
padding: 10px;
.box-shadow(0 0 5px rgba(120,120,120,.2));
outline: none;
}
Expand All @@ -62,7 +62,7 @@ a:hover{
color: #fff;
border:none;
margin:5px 0;
padding: 10px 20px;
padding: 10px;
outline: none;
.box-shadow(0 0 5px rgba(120,120,120,.2));
&.export{
Expand Down Expand Up @@ -173,6 +173,17 @@ a:hover{
overflow: auto;
background: #fff;
.box-shadow(0 0 5px rgba(0,0,0,.2));
textarea{
border:none;
font-size: 10px;
font-family: Arial;
color: #111;
width: 100%;
margin: 5px 0;
padding: 10px 10px;
.box-shadow(0 0 5px rgba(120,120,120,.2));
outline: none;
}
.color{
width: @resultColorSize;
height: @resultColorSize;
Expand Down
2 changes: 1 addition & 1 deletion app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>My AngularJS App</title>
<title>Random Colors</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="bower_components/html5-boilerplate/css/normalize.css">
Expand Down
4 changes: 4 additions & 0 deletions app/views/colors/colors.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@
<p ng-repeat="color in palette">
<span class="color" style="background:#{{color.hex}}"></span> #{{color.hex}}
</p>
<p>
JSON:
<textarea>{{palette}}</textarea>
</p>
</div>
<div class="colors">
<div class="color" ng-repeat="color in patrone" ng-click="toggleColor(color)" style="background:#{{color.hex}}"></div>
Expand Down

0 comments on commit b2e3f70

Please sign in to comment.