SchoolTool

Merge lp:~replaceafill/schooltool/flourish_2.1 into lp:schooltool/2.1

  1. flourish_2.1
  2. Merge into 2.1
Proposed by Douglas Cerna
Status: Merged
Approved by: Gediminas Paulauskas
Approved revision: 3406
Merge reported by: Douglas Cerna
Merged at revision: not available
Proposed branch: lp:~replaceafill/schooltool/flourish_2.1
Merge into: lp:schooltool/2.1
Diff against target: 52 lines (+10/-7)
3 files modified
src/schooltool/skin/flourish/resources/colors.css (+1/-1)
src/schooltool/skin/flourish/resources/flourish.css (+4/-0)
src/schooltool/skin/flourish/resources/gradebook.css (+5/-6)
To merge this branch: bzr merge lp:~replaceafill/schooltool/flourish_2.1
Reviewer Review Type Date Requested Status
Gediminas Paulauskas (community) Approve
Review via email: mp+109680@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Gediminas Paulauskas (menesis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/schooltool/skin/flourish/resources/colors.css'
2--- src/schooltool/skin/flourish/resources/colors.css 2012-03-16 22:59:13 +0000
3+++ src/schooltool/skin/flourish/resources/colors.css 2012-06-11 17:01:21 +0000
4@@ -538,7 +538,7 @@
5 }
6
7 .grades input[type="text"]:focus {
8- border-color: #cccccc;
9+ background-color: #bdd7f0;
10 }
11
12 .grades .changed_bg input[type="text"] {
13
14=== modified file 'src/schooltool/skin/flourish/resources/flourish.css'
15--- src/schooltool/skin/flourish/resources/flourish.css 2012-03-28 15:41:19 +0000
16+++ src/schooltool/skin/flourish/resources/flourish.css 2012-06-11 17:01:21 +0000
17@@ -43,6 +43,10 @@
18 margin-top: 16px;
19 }
20
21+select {
22+ font-size: 12px;
23+}
24+
25 a, a:link, a:visited, a:active {
26 text-decoration: none;
27 }
28
29=== modified file 'src/schooltool/skin/flourish/resources/gradebook.css'
30--- src/schooltool/skin/flourish/resources/gradebook.css 2012-03-08 23:17:37 +0000
31+++ src/schooltool/skin/flourish/resources/gradebook.css 2012-06-11 17:01:21 +0000
32@@ -128,15 +128,14 @@
33 }
34
35 .grades input[type="text"] {
36- border: none;
37- height: 1.2em;
38- width: 4em;
39+ border: 0px;
40+ font-size: 1em;
41+ height: 1.8em;
42+ width: 100%;
43 }
44
45 .grades input[type="text"]:focus {
46- border-width: 0.1em;
47- border-style: solid;
48- width: 3.8em;
49+ outline-style: none;
50 }
51
52 .grades .placeholder {

Subscribers

People subscribed via source and target branches