Skip to content

Commit 47665ff

Browse files
unknownunknown
unknown
authored and
unknown
committed
Changed look, switched jQueryUI theme, removed old jQueryUI images, fixed bugs in date entry
1 parent 22d537d commit 47665ff

File tree

61 files changed

+1602
-154
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1602
-154
lines changed

app/assets/images/actor.png

5.88 KB

app/assets/images/dvd.png

6.34 KB

app/assets/images/genre.png

6.18 KB
-180 Bytes
Binary file not shown.
274 Bytes
274 Bytes
274 Bytes
-274 Bytes
Binary file not shown.
-178 Bytes
Binary file not shown.
-398 Bytes
Binary file not shown.
-397 Bytes
Binary file not shown.
-120 Bytes
Binary file not shown.
-105 Bytes
Binary file not shown.
-400 Bytes
Binary file not shown.
-111 Bytes
Binary file not shown.
-110 Bytes
Binary file not shown.
-119 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-4.27 KB
Binary file not shown.
-4.27 KB
Binary file not shown.
-4.27 KB
Binary file not shown.
-4.27 KB
Binary file not shown.
-4.27 KB
Binary file not shown.

app/assets/images/video.png

5.03 KB

app/assets/javascripts/home.js.coffee

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
# All this logic will automatically be available in application.js.
33
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
44
jQuery ->
5-
$("input[type=submit], a, button").button()
6-
$(".date").datepicker()
5+
$("input[type=submit], button").button()

app/assets/javascripts/jquery-ui-1.10.0.custom.min.js

-6
This file was deleted.

app/assets/javascripts/jquery-ui-1.10.1.custom.min.js

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/assets/javascripts/movies.js.coffee

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
44

55
jQuery ->
6+
$(".date").datepicker({dateFormat: "yy-mm-dd", defaultValue: $(this).val()})
67
logActor = (name, val) ->
78
#console.log(name)
89
$("#actor-list").append($("<li>").text(name).attr("data-id", val).append($("<p class=\"delete-actor\">").button(

app/assets/stylesheets/home.css.scss

+190
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,193 @@
11
// Place all the styles related to the home controller here.
22
// They will automatically be included in application.css.
33
// You can use Sass (SCSS) here: http://sass-lang.com/
4+
5+
$mainblue: #00bff3;
6+
$lightgrey: #a0a0a0;
7+
$backblue: #e5f1f6;
8+
9+
10+
$darkblue: #409bbf;
11+
$lightblue: #6ab9cd;
12+
13+
14+
body {
15+
background: $backblue;
16+
margin: 0;
17+
p, ul, li, td {
18+
font-family: "Myriad Pro", arial, sans-serif;
19+
font-size: 14px;
20+
}
21+
}
22+
a {
23+
color: $lightblue;
24+
text-decoration: none;
25+
border-bottom: 1px solid $lightblue;
26+
}
27+
hgroup{
28+
width: 100%;
29+
background: white;
30+
height: 4.5em;
31+
h1 {
32+
font-family: "Adobe Jenson Pro", Constantia, "Times New Roman", serif;
33+
font-variant: small-caps;
34+
font-weight: normal;
35+
display: inline-block;
36+
margin: 0.7em;
37+
font-size: 30px;
38+
}
39+
a {
40+
border: none;
41+
}
42+
nav {
43+
display: inline-block;
44+
height: 100%;
45+
}
46+
nav a {
47+
display: inline-block;
48+
border-bottom: 2px solid $mainblue;
49+
margin-left: 0.7em;
50+
font-size: 1.5em;
51+
text-decoration: none;
52+
font-family: Candara, Arial, sans-serif;
53+
font-variant: small-caps;
54+
height: 64%;
55+
&:hover {
56+
color: white;
57+
background: $mainblue;
58+
}
59+
}
60+
}
61+
62+
section h1 {
63+
font-family: "Adobe Jenson Pro", Constantia, "Times New Roman", serif;
64+
font-variant: small-caps;
65+
font-weight: normal;
66+
font-size: 24px;
67+
padding-left: 2em;
68+
border-bottom: 2px solid $mainblue;
69+
-moz-border-bottom-colors: white, $mainblue, $mainblue, $mainblue, white;
70+
-webkit-border-image: -webkit-gradient(linear, left bottom, right bottom, from(#fff), to(#fff), color-stop(0.1, $mainblue), color-stop(0.9, $mainblue)) 0 0 1000 0 stretch;
71+
}
72+
#center-content {
73+
width: 50%;
74+
margin: 20% auto;
75+
background: white;
76+
border-radius: 20px;
77+
padding: 10px;
78+
input[name=db-search] {
79+
margin-left: 8%;
80+
width: 70%;
81+
margin-right: 1%;
82+
font-size: 16px;
83+
font-family: "Myriad Pro", Arial, sans-serif;
84+
border: 1px solid $lightgrey;
85+
margin-bottom: 9%;
86+
}
87+
button {
88+
margin-left: 0;
89+
width: 13%;
90+
}
91+
}
92+
p.info {
93+
font-style: italic;
94+
color: $lightgrey;
95+
margin-bottom: 5px;
96+
margin-top: 5px;
97+
a {
98+
font-style: normal;
99+
}
100+
}
101+
102+
@mixin tagbutton {
103+
font-family: Candara, Arial, sans-serif;
104+
color: white;
105+
background: $mainblue;
106+
padding: 0.2em 0.7em;
107+
border-radius: 5px;
108+
font-size: 16px;
109+
text-decoration: none;
110+
font-variant: small-caps;
111+
margin: 2px;
112+
}
113+
114+
#content {
115+
width: 80%;
116+
margin: 20px auto;
117+
background: white;
118+
border-radius: 20px;
119+
padding: 10px;
120+
div.optionsarea {
121+
width: 10%;
122+
display: table-cell;
123+
a {
124+
@include tagbutton();
125+
display: inline-block;
126+
}
127+
}
128+
div.mainarea {
129+
width: 89.4%;
130+
display: table-cell;
131+
article {
132+
font-family: Candara, Arial, sans-serif;
133+
padding-left: 64px;
134+
margin-top: 20px;
135+
padding-bottom: 5px;
136+
h2 {
137+
font-family: "Adobe Jenson Pro", Constantia, "Times New Roman", serif;
138+
font-size: 24px;
139+
font-weight: normal;
140+
display: inline-block;
141+
margin-bottom: 4px;
142+
margin-top: 25px;
143+
}
144+
p {
145+
margin-top: 2px;
146+
color: $lightgrey;
147+
font-style: italic;
148+
}
149+
span.lastwatched {
150+
color: black;
151+
font-style: normal;
152+
}
153+
a.genre {
154+
@include tagbutton();
155+
}
156+
div {
157+
margin-top: 5px;
158+
}
159+
.btn-edit, .btn-delete {
160+
display: none;
161+
border: none;
162+
}
163+
&:hover .btn-edit, &:hover .btn-delete {
164+
display: inline-block;
165+
}
166+
}
167+
article.dvd {
168+
background: url("dvd.png") no-repeat;
169+
}
170+
article.video {
171+
background: url("video.png") no-repeat;
172+
}
173+
article.person {
174+
background: url("actor.png") no-repeat;
175+
}
176+
article.genre {
177+
background: url("genre.png") no-repeat;
178+
}
179+
input[name=db-search] {
180+
margin-left: 8%;
181+
width: 70%;
182+
margin-right: 1%;
183+
font-size: 16px;
184+
font-family: "Myriad Pro", Arial, sans-serif;
185+
border: 1px solid $lightgrey;
186+
margin-bottom: 10px;
187+
}
188+
button {
189+
margin-left: 0;
190+
width: 13%;
191+
}
192+
}
193+
}

app/assets/stylesheets/jquery-ui-1.10.0.custom.min.css

-5
This file was deleted.

0 commit comments

Comments
 (0)