Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

IT'S WORKING\! IT'S WORKING\!

  • Loading branch information...
commit bd30380d19534f6568ce92d2e6142da475b1efe9 1 parent 463a752
Alex Iskander authored
2  apps/hedwig/controllers/article.js
View
@@ -30,6 +30,6 @@ Hedwig.articleController = SC.ObjectController.create(
},
replacementFor: function(href) {
- return "<div class='hedwig-demo' href='" + href + "' style=''></div>";
+ return "<div class='hedwig-demo' href='" + href + "' style=''>Example</div>";
}
}) ;
8 apps/hedwig/controllers/guides.js
View
@@ -16,13 +16,6 @@ Hedwig.guidesController = SC.ObjectController.create(
currentGuide: null,
loadGuide: function(path) {
- // quick hack to make things work offline, properly.
- var g = window.localStorage["hedwig-current-guide"];
- if (g) {
- this.set("currentGuide", g);
- }
-
-
SC.Request.getUrl(path).json().notify(this, "didLoadGuide").send();
},
@@ -30,7 +23,6 @@ Hedwig.guidesController = SC.ObjectController.create(
// obviously I have no error handling right now. Did I mention I'm in a bit of a hurry?
// /me crosses fingers
if (SC.ok(response)) {
- window.localStorage["hedwig-current-guide"] = response.get("body");
this.set("currentGuide", response.get("body"));
}
}
2  frameworks/sproutcore
@@ -1 +1 @@
-Subproject commit 89e1ef1f2c3c8823ad38d174d5250356d08a5901
+Subproject commit ba904546927e6f11c7ef3a348b1a22a7af470d23
51 themes/pig/resources/theme.css
View
@@ -88,16 +88,26 @@
overflow: visible;
}
.sc-theme .sc-view.ace.light.pig.sc-view.demo .sc-view.flippable { -webkit-backface-visibility: hidden; }
-.hedwig-demo {
- margin-left: 10px;
- margin-right: 10px;
- height: 150px;
- border: 1px solid gray;
-}
.sc-theme .sc-view.ace.light.pig.sc-static-content-view {
-webkit-user-select: text;
font-size: 1.2em;
}
+.sc-theme .sc-view.ace.light.pig.sc-static-content-view .hedwig-demo {
+ background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#f0f0f0), to(#d9d9d9));
+ color: #464646;
+ text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.7);
+ font-weight: bold;
+ font-size: 18px;
+ padding: 10px;
+ padding-bottom: 13px;
+ text-align: center;
+ width: 150px;
+ margin-right: auto;
+ border: 1px solid #b4b4b4;
+ -webkit-border-radius: 7px;
+ -webkit-box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3);
+}
+.sc-theme .sc-view.ace.light.pig.sc-static-content-view .hedwigh-demo:active { background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#dedede), to(#c2c2c2)); }
.sc-theme .sc-view.ace.light.pig.sc-static-content-view h1 { font-size: 1.5em; }
.sc-theme .sc-view.ace.light.pig.sc-static-content-view h1 { color: #5078aa; }
.sc-theme .sc-view.ace.light.pig.sc-static-content-view h2 { color: #5078aa; }
@@ -129,12 +139,13 @@
font-weight: bold;
}
.sc-theme .sc-view.ace.light.pig.sc-scroll-view.source {
- background-color: white;
+ background-color: #2d2d2d;
-webkit-transform: translate3d(0px,0px,0px);
}
.sc-theme .sc-view.ace.light.pig.sc-scroll-view.source .sc-container-view { -webkit-transform: translate3d(0px,0px,0px); }
.sc-theme .sc-view.ace.light.pig.sc-scroll-view.source .sc-container-view .sc-static-content-view { -webkit-transform: translate3d(0px,0px,0px); }
.sc-theme .sc-view.ace.light.pig.sc-static-layout.source {
+ background-color: #2d2d2d;
font-size: 14px;
white-space: pre;
padding: 0px;
@@ -148,20 +159,28 @@
left: 0px;
top: 0px;
width: 50px;
- background-color: #eeeeee;
- color: #cccccc;
+ border-right: 1px solid #787878;
+ background-color: #191919;
+ color: #aaaaaa;
}
.sc-theme .sc-view.ace.light.pig.sc-static-layout.source .line-numbers span { display: block; }
-.sc-theme .sc-view.ace.light.pig.sc-static-layout.source .code { margin-left: 65px; }
-.sc-theme .sc-view.ace.light.pig.sc-static-layout.source .code .class { color: #000096; }
-.sc-theme .sc-view.ace.light.pig.sc-static-layout.source .code .comment { color: #6496c8; }
-.sc-theme .sc-view.ace.light.pig.sc-static-layout.source .code .string { color: #00640a; }
-.sc-theme .sc-view.ace.light.pig.sc-static-layout.source .code .number { color: #0000ff; }
+.sc-theme .sc-view.ace.light.pig.sc-static-layout.source .code {
+ margin-left: 65px;
+ color: #e6e1dc;
+}
+.sc-theme .sc-view.ace.light.pig.sc-static-layout.source .code .class { color: #ffffff; }
+.sc-theme .sc-view.ace.light.pig.sc-static-layout.source .code .variable { color: #d0d0ff; }
+.sc-theme .sc-view.ace.light.pig.sc-static-layout.source .code .comment {
+ color: #bc9458;
+ font-style: italic;
+}
+.sc-theme .sc-view.ace.light.pig.sc-static-layout.source .code .string { color: #a5c261; }
+.sc-theme .sc-view.ace.light.pig.sc-static-layout.source .code .number { color: #a5c261; }
.sc-theme .sc-view.ace.light.pig.sc-static-layout.source .code .keyword {
- color: #196e19;
+ color: #cc7833;
font-weight: bold;
}
.sc-theme .sc-view.ace.light.pig.sc-static-layout.source .code .this {
- color: #196e19;
+ color: #cc7833;
font-weight: bold;
}
22 themes/pig/src/code/code.css
View
@@ -1,5 +1,5 @@
@view(sc-scroll-view).source {
- background-color: white;
+ background-color: rgb(45, 45, 45);
-webkit-transform: translate3d(0px,0px,0px);
.sc-container-view {
@@ -11,6 +11,7 @@
}
@view(sc-static-layout).source {
+ background-color: rgb(45, 45, 45);
font-size: 14px;
white-space: pre;
padding: 0px;
@@ -24,8 +25,9 @@
left: 0px;
top: 0px;
width: 50px;
- background-color:#eee;
- color: #ccc;
+ border-right:1px solid rgb(120,120,120);
+ background-color: rgb(25, 25, 25);
+ color: #aaa;
span {
display:block;
@@ -34,12 +36,14 @@
.code {
margin-left: 65px;
+ color: rgb(230, 225, 220);
- .class { color: rgb(0, 0, 150); }
- /*code .variable { color: rgb(10, 70, 10); }*/
- .comment { color: rgb(100, 150, 200); }
- .string { color: rgb(0, 100, 10); }
- .number { color: rgb(0, 0, 255); }
- .keyword, .this { color: rgb(25, 110, 25); font-weight: bold; }
+ .class { color: rgb(255,255,255); }
+ .variable { color: rgb(208,208,255); }
+ .comment { color: rgb(188,148,88); font-style: italic; }
+ .string { color: rgb(165,194,97); }
+ .number { color: rgb(165,194,97); }
+
+ .keyword, .this { color: rgb(204, 120, 51); font-weight: bold; }
}
}
26 themes/pig/src/content.css
View
@@ -1,11 +1,27 @@
-.hedwig-demo {
- margin-left:10px;margin-right:10px;height:150px;
- border: 1px solid gray;
-}
-
@view(sc-static-content-view) {
-webkit-user-select: text;
font-size: 1.2em;
+
+ .hedwig-demo {
+ background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#F0F0F0), to(#D9D9D9));
+ color: rgb(70,70,70);
+ text-shadow: 0px 1px 1px rgba(255,255,255,.7);
+ font-weight:bold;
+ font-size:18px;
+ padding:10px;
+ padding-bottom:13px;
+ text-align:center;
+ width:150px;
+ margin-right:auto;
+ border: 1px solid rgb(180,180,180);
+ -webkit-border-radius: 7px;
+ -webkit-box-shadow: 1px 1px 2px rgba(0,0,0,.3);
+ }
+
+ .hedwigh-demo:active{
+ background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#DEDEDE), to(#C2C2C2));
+ }
+
h1 {
font-size: 1.5em;
}
Please sign in to comment.
Something went wrong with that request. Please try again.