Skip to content

Commit 92efad7

Browse files
teamconsteamcons
committed
use more specific class naming, and use % instead of em
1 parent 25e1240 commit 92efad7

File tree

2 files changed

+70
-70
lines changed

2 files changed

+70
-70
lines changed

‎data/Application.css‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ editablelabel {
3131
letter-spacing: .04em;
3232
}
3333

34-
textview,
34+
textview.text,
3535
editablelabel.editing {
3636
background-image: none;
3737
font-weight: 500;
@@ -71,65 +71,65 @@ actionbar .themedbutton:focus {
7171
}
7272

7373
/* Font zooms */
74-
window.antsized textview.text {font-size: 0.4em;}
75-
window.antsized editablelabel {font-size: 0.25em;}
76-
window.antsized editablelabel.editing {font-size: 0.20em;}
74+
window.s20 textview.text {font-size: 40%;}
75+
window.s20 editablelabel {font-size: 25%;}
76+
window.s20 editablelabel.editing {font-size: 20%;}
7777

78-
window.muchsmaller textview.text {font-size: 0.6em;}
79-
window.muchsmaller editablelabel {font-size: 0.45em;}
80-
window.muchsmaller editablelabel.editing {font-size: 0.40em;}
78+
window.s40 textview.text {font-size: 60%;}
79+
window.s20 editablelabel {font-size: 45%;}
80+
window.s20 editablelabel.editing {font-size: 40%;}
8181

82-
window.smaller textview.text {font-size: 0.8em;}
83-
window.smaller editablelabel {font-size: 0.65em;}
84-
window.smaller editablelabel.editing {font-size: 0.60em;}
82+
window.s60 textview.text {font-size: 80%;}
83+
window.s60 editablelabel {font-size: 65%;}
84+
window.s60 editablelabel.editing {font-size: 60%;}
8585

86-
window.small textview.text {font-size: 1.0em;}
87-
window.small editablelabel {font-size: 0.85em;}
88-
window.small editablelabel.editing {font-size: 0.80em;}
86+
window.s80 textview.text {font-size: 100%;}
87+
window.s80 editablelabel {font-size: 85%;}
88+
window.s80 editablelabel.editing {font-size: 80%;}
8989

90-
window.normal_zoom textview.text {font-size: 1.2em;}
91-
window.normal_zoom editablelabel {font-size: 1.05em;}
92-
window.normal_zoom editablelabel.editing {font-size: 1em;}
90+
window.s100 textview.text {font-size: 120%;}
91+
window.s100 editablelabel {font-size: 105%;}
92+
window.s100 editablelabel.editing {font-size: 100%;}
9393

94-
window.big textview.text {font-size: 1.4em;}
95-
window.big editablelabel {font-size: 1.25em;}
96-
window.big editablelabel.editing {font-size: 1.20em;}
94+
window.s120 textview.text {font-size: 140%;}
95+
window.s120 editablelabel {font-size: 125%;}
96+
window.s120 editablelabel.editing {font-size: 120%;}
9797

98-
window.bigger textview.text {font-size: 1.6em;}
99-
window.bigger editablelabel {font-size: 1.45em;}
100-
window.bigger editablelabel.editing {font-size: 1.40em;}
98+
window.s140 textview.text {font-size: 160%;}
99+
window.s140 editablelabel {font-size: 145%;}
100+
window.s140 editablelabel.editing {font-size: 140%;}
101101

102-
window.muchbigger textview.text {font-size: 1.8em;}
103-
window.muchbigger editablelabel {font-size: 1.65em;}
104-
window.muchbigger editablelabel.editing {font-size: 1.60em;}
102+
window.s160 textview.text {font-size: 180%;}
103+
window.s160 editablelabel {font-size: 165%;}
104+
window.s160 editablelabel.editing {font-size: 160%;}
105105

106-
window.muchmuchbigger textview.text {font-size: 2em;}
107-
window.muchmuchbigger editablelabel {font-size: 1.85em;}
108-
window.muchmuchbigger editablelabel.editing {font-size: 1.80em;}
106+
window.s180 textview.text {font-size: 200%;}
107+
window.s180 editablelabel {font-size: 185%;}
108+
window.s180 editablelabel.editing {font-size: 180%;}
109109

110-
window.huge textview.text {font-size: 2.2em;}
111-
window.huge editablelabel {font-size: 2.05em;}
112-
window.huge editablelabel.editing {font-size: 2.00em;}
110+
window.s200 textview.text {font-size: 220%;}
111+
window.s200 editablelabel {font-size: 205%;}
112+
window.s200 editablelabel.editing {font-size: 200%;}
113113

114-
window.superhuge textview.text {font-size: 2.4em;}
115-
window.superhuge editablelabel {font-size: 2.25em;}
116-
window.superhuge editablelabel.editing {font-size: 2.20em;}
114+
window.s220 textview.text {font-size: 240%;}
115+
window.s220 editablelabel {font-size: 225%;}
116+
window.s220 editablelabel.editing {font-size: 220%;}
117117

118-
window.megahuge textview.text {font-size: 2.6em;}
119-
window.megahuge editablelabel {font-size: 2.45em;}
120-
window.megahuge editablelabel.editing {font-size: 2.40em;}
118+
window.s240 textview.text {font-size: 260%;}
119+
window.s240 editablelabel {font-size: 245%;}
120+
window.s240 editablelabel.editing {font-size: 240%;}
121121

122-
window.ultrahuge textview.text {font-size: 2.8em;}
123-
window.ultrahuge editablelabel {font-size: 2.65em;}
124-
window.ultrahuge editablelabel.editing {font-size: 2.60em;}
122+
window.s260 textview.text {font-size: 280%;}
123+
window.s260 editablelabel {font-size: 265%;}
124+
window.s260 editablelabel.editing {font-size: 260%;}
125125

126-
window.massive textview.text {font-size: 3em;}
127-
window.massive editablelabel {font-size: 2.85em;}
128-
window.massive editablelabel.editing {font-size: 2.80em;}
126+
window.s280 textview.text {font-size: 300%;}
127+
window.s280 editablelabel {font-size: 285%;}
128+
window.s280 editablelabel.editing {font-size: 280%;}
129129

130-
window.urmom textview.text {font-size: 3.2em;}
131-
window.urmom editablelabel {font-size: 3.05em;}
132-
window.urmom editablelabel.editing {font-size: 3.00em;}
130+
window.s300 textview.text {font-size: 320%;}
131+
window.s300 editablelabel {font-size: 305%;}
132+
window.s300 editablelabel.editing {font-size: 300%;}
133133

134134

135135
/* ALL the colorpills */
@@ -194,4 +194,4 @@ window.animated actionbar .themedbutton:focus {
194194
window.animated editablelabel,
195195
window.animated actionbar image {
196196
transition: color 750ms cubic-bezier(0.4, 0, 0.2, 1);
197-
}
197+
}

‎src/Objects/Zoom.vala‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ public enum Jorts.Zoom {
4444
case HUGE: return 200;
4545
case SUPERHUGE: return 220;
4646
case MEGAHUGE: return 240;
47-
// case ULTRAHUGE: return 260;
48-
// case MASSIVE: return 280;
49-
// case URMOM: return 300;
47+
case ULTRAHUGE: return 260;
48+
case MASSIVE: return 280;
49+
case URMOM: return 300;
5050
default: return 100;
5151
}
5252
}
@@ -78,26 +78,26 @@ public enum Jorts.Zoom {
7878

7979
/*************************************************/
8080
/**
81-
* We cannot use numbers in CSS, so we have to translate a number into a string
81+
* CSS name is s + size. CSS classes cannot start name with number
8282
*/
8383
public string to_class () {
8484
switch (this) {
85-
case ANTSIZED: return "antsized";
86-
case MUCHSMALLER: return "muchsmaller";
87-
case SMALLER: return "smaller";
88-
case SMALL: return "small";
89-
case NORMAL: return "normal_zoom";
90-
case BIG: return "big";
91-
case BIGGER: return "bigger";
92-
case MUCHBIGGER: return "muchbigger";
93-
case MUCHMUCHBIGGER: return "muchmuchbigger";
94-
case HUGE: return "huge";
95-
case SUPERHUGE: return "superhuge";
96-
case MEGAHUGE: return "megahuge";
97-
// case ULTRAHUGE: return "ultrahuge";
98-
// case MASSIVE: return "massive";
99-
// case URMOM: return "urmom";
100-
default: return "normal_zoom";
85+
case ANTSIZED: return "s20";
86+
case MUCHSMALLER: return "s40";
87+
case SMALLER: return "s60";
88+
case SMALL: return "s80";
89+
case NORMAL: return "s100";
90+
case BIG: return "s120";
91+
case BIGGER: return "s140";
92+
case MUCHBIGGER: return "s160";
93+
case MUCHMUCHBIGGER: return "s180";
94+
case HUGE: return "s200";
95+
case SUPERHUGE: return "s220";
96+
case MEGAHUGE: return "s240";
97+
case ULTRAHUGE: return "s260";
98+
case MASSIVE: return "s280";
99+
case URMOM: return "s300";
100+
default: return "s100";
101101
}
102102
}
103103

@@ -119,9 +119,9 @@ public enum Jorts.Zoom {
119119
case HUGE: return 48;
120120
case SUPERHUGE: return 52;
121121
case MEGAHUGE: return 54;
122-
// case ULTRAHUGE: return 56;
123-
// case MASSIVE: return 60;
124-
// case URMOM: return 64;
122+
case ULTRAHUGE: return 56;
123+
case MASSIVE: return 60;
124+
case URMOM: return 64;
125125
default: return 32;
126126
}
127127
}

0 commit comments

Comments
 (0)