Skip to content

Commit e59d716

Browse files
jonmountjoyjonmountjoy
committed
Merge branch 'ui'
2 parents 3e926b5 + a8abea1 commit e59d716

File tree

6 files changed

+103
-75
lines changed

6 files changed

+103
-75
lines changed

‎app/assets/images/lang-logo.png

4.01 KB
Loading

‎app/assets/stylesheets/scaffolds.css.scss

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +0,0 @@
1-
body {
2-
background-color: #fff;
3-
color: #333;
4-
font-family: verdana, arial, helvetica, sans-serif;
5-
font-size: 13px;
6-
line-height: 18px;
7-
}
8-
9-
p, ol, ul, td {
10-
font-family: verdana, arial, helvetica, sans-serif;
11-
font-size: 13px;
12-
line-height: 18px;
13-
}
14-
15-
pre {
16-
background-color: #eee;
17-
padding: 10px;
18-
font-size: 11px;
19-
}
20-
21-
a {
22-
color: #000;
23-
&:visited {
24-
color: #666;
25-
}
26-
&:hover {
27-
color: #fff;
28-
background-color: #000;
29-
}
30-
}
31-
32-
div {
33-
&.field, &.actions {
34-
margin-bottom: 10px;
35-
}
36-
}
37-
38-
#notice {
39-
color: green;
40-
}
41-
42-
.field_with_errors {
43-
padding: 2px;
44-
background-color: red;
45-
display: table;
46-
}
47-
48-
#error_explanation {
49-
width: 450px;
50-
border: 2px solid red;
51-
padding: 7px;
52-
padding-bottom: 0;
53-
margin-bottom: 20px;
54-
background-color: #f0f0f0;
55-
h2 {
56-
text-align: left;
57-
font-weight: bold;
58-
padding: 5px 5px 5px 15px;
59-
font-size: 12px;
60-
margin: -7px;
61-
margin-bottom: 0px;
62-
background-color: #c00;
63-
color: #fff;
64-
}
65-
ul li {
66-
font-size: 12px;
67-
list-style: square;
68-
}
69-
}

‎app/assets/stylesheets/theme.css.scss

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
$brand-primary: #532F8C;
2+
$brand-language: #B01302;
3+
4+
.jumbotron {
5+
background: $brand-primary;
6+
color: white;
7+
padding-bottom: 80px;
8+
9+
.btn-primary {
10+
background: lighten($brand-primary, 20%);
11+
border-color: lighten($brand-primary, 20%);
12+
&:hover {
13+
background: lighten($brand-primary, 15%);
14+
}
15+
}
16+
17+
p {
18+
color: lighten($brand-primary, 50%);
19+
max-width: 75%;
20+
margin: 1em auto 2em;
21+
}
22+
23+
.navbar + & {
24+
margin-top: -20px;
25+
}
26+
27+
.lang-logo {
28+
display: block;
29+
background: $brand-language;
30+
border-radius: 50%;
31+
overflow: hidden;
32+
width: 100px;
33+
height: 100px;
34+
margin: auto;
35+
border: 2px solid white;
36+
img {
37+
max-width: 100%;
38+
}
39+
}
40+
41+
}
42+

‎app/assets/stylesheets/welcome.css.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// Place all the styles related to the welcome controller here.
22
// They will automatically be included in application.css.
3-
// You can use Sass (SCSS) here: http://sass-lang.com/
3+
// You can use Sass (SCSS) here: http://sass-lang.com/

‎app/views/layouts/application.html.erb

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,33 @@
22
<html>
33
<head>
44
<title>RubyGettingStarted</title>
5+
<%= stylesheet_link_tag '//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css' %>
56
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
7+
<%= javascript_include_tag '//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js' %>
68
<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
79
<%= csrf_meta_tags %>
810
</head>
911
<body>
12+
<nav class="navbar navbar-default navbar-static-top navbar-inverse">
13+
<div class="container">
14+
<ul class="nav navbar-nav">
15+
<li class="active">
16+
<a href="/"><span class="glyphicon glyphicon-home"></span> Home</a>
17+
</li>
18+
<li>
19+
<a href="#"><span class="glyphicon glyphicon-user"></span> Link</a>
20+
</li>
21+
<li>
22+
<a href="#"><span class="glyphicon glyphicon-info-sign"></span> Link</a>
23+
</li>
24+
</ul>
25+
<ul class="nav navbar-nav navbar-right">
26+
<li class="navbar-right">
27+
<a href="https://devcenter.heroku.com"><span class="glyphicon glyphicon-book"></span> Heroku Dev Center</a>
28+
</li>
29+
</ul>
30+
</div>
31+
</nav>
1032

1133
<%= yield %>
1234

‎app/views/welcome/index.erb

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,39 @@
1-
<h1>Getting Started with Ruby</h1>
2-
3-
<p>
4-
Welcome!
5-
</p>
1+
<div class="jumbotron text-center">
2+
<div class="container">
3+
<a href="/" class="lang-logo">
4+
<img src="assets/lang-logo.png">
5+
</a>
6+
<h1>Getting Started with Ruby</h1>
7+
<p>This is a sample Ruby application deployed to Heroku. It's a reasonably simple app - but a good foundation for understanding how to get the most out of the Heroku platform.</p>
8+
<a type="button" class="btn btn-lg btn-default" href="https://devcenter.heroku.com/articles/getting-started-with-ruby"><span class="glyphicon glyphicon-flash"></span> Getting Started with Ruby</a>
9+
<a type="button" class="btn btn-lg btn-primary" href="https://github.com/heroku/ruby-getting-started"><span class="glyphicon glyphicon-download"></span> Source on Github</a>
10+
</div>
11+
</div>
12+
<div class="container">
13+
<div class="alert alert-info text-center" role="alert">
14+
To deploy your own copy, head over to <a href="https://devcenter.heroku.com/articles/getting-started-with-ruby" class="alert-link">Getting Started with Ruby</a> on Heroku. The <a href="https://github.com/heroku/ruby-getting-started" class="alert-link">source code</a> for the application is also available.
15+
</div>
16+
<hr>
17+
<div class="row">
18+
<div class="col-md-6">
19+
<h3><span class="glyphicon glyphicon-info-sign"></span> How this sample app works</h3>
20+
<ul>
21+
<li>This app was deployed to Heroku, either using Git or by using <a href="https://github.com/heroku/ruby-getting-started">one-click Heroku Button on the repository</a>.</li>
622

23+
<li>When Heroku received the source code, it grabbed all the dependencies in the <a href="https://github.com/heroku/ruby-getting-started/blob/master/Gemfile">Gemfile</a>.</li>
24+
<li>The platform then spins up a dyno, a lightweight container that provides an isolated environment in which the slug can be mounted and executed.</li>
25+
<li>You can scale your app, manage it, and deploy over <a href="https://addons.heroku.com/">150 add-on services</a>, from the Dashboard or CLI, in which case multiple dynos will be spun up.</li>
26+
<li>Check out the <a href="https://devcenter.heroku.com/articles/getting-started-with-ruby">Getting Started</a> guide to learn more!</li>
27+
</ul>
28+
</div>
29+
<div class="col-md-6">
30+
<h3><span class="glyphicon glyphicon-link"></span> Helpful Links</h3>
31+
<ul>
32+
<li><a href="https://www.heroku.com/home">Heroku</a></li>
33+
<li><a href="https://devcenter.heroku.com/">Heroku Dev Center</a></li>
34+
<li><a href="https://devcenter.heroku.com/articles/getting-started-with-ruby">Getting Started with Ruby on Heroku</a></li>
35+
<li><a href="https://devcenter.heroku.com/articles/deploying-ruby-and-rails">Deploying Ruby Apps on Heroku</a></li>
36+
</ul>
37+
</div>
38+
</div>
39+
</div>

0 commit comments

Comments
 (0)