Dmedia

Merge lp:~jderose/dmedia/opera into lp:dmedia

  1. opera
  2. Merge into trunk
Proposed by Jason Gerard DeRose
Status: Merged
Merged at revision: 154
Proposed branch: lp:~jderose/dmedia/opera
Merge into: lp:dmedia
Diff against target: 131 lines (+22/-3)
1 file modified
dmedia/data/style.css (+22/-3)
To merge this branch: bzr merge lp:~jderose/dmedia/opera
Reviewer Review Type Date Requested Status
Jack Leigh (community) Approve
Review via email: mp+49169@code.launchpad.net

Description of the change

So I applied leighman's patch and then made a small change: I rearranged some of the properties so than the non-vendor prefixed property is after the vendor-prefixed versions. This means the non-vendor prefixed properties will take precedence - this is the recommended best-practice.

To post a comment you must log in.
Revision history for this message
Jack Leigh (leighman) wrote :

In line 70 and 78 the non-prefixed version is still first, I think.
Also at ~78 you could add a -moz-box-shadow perhaps, which I guess I missed.

Thanks!

review: Needs Fixing
lp:~jderose/dmedia/opera updated
156. By Jason Gerard DeRose

Fixed placement of few more non-prefixed properties

Revision history for this message
Jason Gerard DeRose (jderose) wrote :

Fixed, fixed, and fixed. Good, catch!

How about now?

Revision history for this message
Jack Leigh (leighman) wrote :

Looks good to me!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'dmedia/data/style.css'
--- dmedia/data/style.css 2011-01-25 21:30:13 +0000
+++ dmedia/data/style.css 2011-02-10 09:52:40 +0000
@@ -25,10 +25,12 @@
25 padding:10px;25 padding:10px;
26 -webkit-border-radius:5px;26 -webkit-border-radius:5px;
27 -moz-border-radius:5px;27 -moz-border-radius:5px;
28 border-radius:5px;
28 background-color:rgb(182, 189, 192);29 background-color:rgb(182, 189, 192);
29 background:-webkit-gradient(linear, left bottom, left top, color-stop(1, rgb(238,240,240)), color-stop(0.5, rgb(182,189,192)));30 background:-webkit-gradient(linear, left bottom, left top, color-stop(1, rgb(238,240,240)), color-stop(0.5, rgb(182,189,192)));
30 background:-moz-linear-gradient(center bottom, rgb(182,189,192) 50%, rgb(238,240,240) 100%);31 background:-moz-linear-gradient(center bottom, rgb(182,189,192) 50%, rgb(238,240,240) 100%);
31 overflow:auto;32 overflow:auto;
33 box-shadow:inset 3px 3px 5px rgba(0,0,0,0.5);
32/*34/*
33FIXME: WebKit-GTK currently has a severe performance problem when using35FIXME: WebKit-GTK currently has a severe performance problem when using
34large box-shadows, so this has been disabled for now. See:36large box-shadows, so this has been disabled for now. See:
@@ -38,7 +40,7 @@
38 https://bugs.webkit.org/show_bug.cgi?id=4103140 https://bugs.webkit.org/show_bug.cgi?id=41031
39*/41*/
40/* -webkit-box-shadow:inset 3px 3px 5px rgba(0,0,0,0.5); */42/* -webkit-box-shadow:inset 3px 3px 5px rgba(0,0,0,0.5); */
41/* -moz-box-shadow:inset 3px 3px 5px rgba(0,0,0,0.5); */43 -moz-box-shadow:inset 3px 3px 5px rgba(0,0,0,0.5);
42 border:1px solid #ddd;44 border:1px solid #ddd;
43}45}
4446
@@ -63,10 +65,12 @@
63 border-top-right-radius:0px;65 border-top-right-radius:0px;
64 -webkit-box-shadow:3px 3px 5px rgba(0,0,0,0.5);66 -webkit-box-shadow:3px 3px 5px rgba(0,0,0,0.5);
65 -moz-box-shadow:3px 3px 5px rgba(0,0,0,0.5);67 -moz-box-shadow:3px 3px 5px rgba(0,0,0,0.5);
68 box-shadow:3px 3px 5px rgba(0,0,0,0.5);
66 border:1px solid #ccc;69 border:1px solid #ccc;
67 opacity: 1;70 opacity: 1;
71 -webkit-transform: translate(0px, 0px);
68 -moz-transform: translate(0px, 0px);72 -moz-transform: translate(0px, 0px);
69 -webkit-transform: translate(0px, 0px);73 -o-transform: translate(0px, 0px);
70}74}
7175
72#info.out{76#info.out{
@@ -76,6 +80,7 @@
76 visibility:hidden;80 visibility:hidden;
77 -webkit-transform: translate(0px, -80px);81 -webkit-transform: translate(0px, -80px);
78 -moz-transform: translate(0px, -80px);82 -moz-transform: translate(0px, -80px);
83 -o-transform: translate(0px, -80px);
79}84}
8085
81#display{86#display{
@@ -93,12 +98,16 @@
93 height:50px;98 height:50px;
94 width:290px;99 width:290px;
95 -webkit-border-radius:25px;100 -webkit-border-radius:25px;
101 -moz-border-radius:25px;
102 border-radius:25px;
96 border-bottom-left-radius:5px;103 border-bottom-left-radius:5px;
97 border-bottom-right-radius:5px;104 border-bottom-right-radius:5px;
98}105}
99106
100.search_field{107.search_field{
101 -webkit-border-radius:15px;108 -webkit-border-radius:15px;
109 -moz-border-radius:15px;
110 border-radius:15px;
102 border:1px solid #444;111 border:1px solid #444;
103 height:30px;112 height:30px;
104 width:290px;113 width:290px;
@@ -107,13 +116,17 @@
107 background-image:url("search.png");116 background-image:url("search.png");
108 background-repeat:no-repeat;117 background-repeat:no-repeat;
109 background-position:15px 3px;118 background-position:15px 3px;
110 /*-webkit-box-shadow:inset 0px 3px 10px rgba(0,0,0,0.5);*/119/* -webkit-box-shadow:inset 0px 3px 10px rgba(0,0,0,0.5);*/
120 -moz-box-shadow:inset 0px 3px 10px rgba(0,0,0,0.5);
121 box-shadow:inset 0px 3px 10px rgba(0,0,0,0.5);
111}122}
112123
113#display img{124#display img{
114 border:5px solid #ddd;125 border:5px solid #ddd;
115 border-bottom:20px solid #ddd;126 border-bottom:20px solid #ddd;
116 -webkit-box-shadow:3px 3px 10px rgba(0,0,0,0.5);127 -webkit-box-shadow:3px 3px 10px rgba(0,0,0,0.5);
128 -moz-box-shadow:3px 3px 10px rgba(0,0,0,0.5);
129 box-shadow:3px 3px 10px rgba(0,0,0,0.5);
117 margin-left:auto;130 margin-left:auto;
118}131}
119132
@@ -128,6 +141,7 @@
128 -moz-transition: border-color 1s ease;141 -moz-transition: border-color 1s ease;
129 -webkit-box-shadow:2px 2px 5px rgba(0, 0, 0, 0.5);142 -webkit-box-shadow:2px 2px 5px rgba(0, 0, 0, 0.5);
130 -moz-box-shadow:2px 2px 5px rgba(0, 0, 0, 0.5);143 -moz-box-shadow:2px 2px 5px rgba(0, 0, 0, 0.5);
144 box-shadow:2px 2px 5px rgba(0, 0, 0, 0.5);
131 margin:1px;145 margin:1px;
132 border-width:4px;146 border-width:4px;
133 border-color:#222;147 border-color:#222;
@@ -162,6 +176,7 @@
162 font-family:sans-serif;176 font-family:sans-serif;
163 -webkit-box-shadow:inset 1px 1px 2px rgba(0,0,0,0.5);177 -webkit-box-shadow:inset 1px 1px 2px rgba(0,0,0,0.5);
164 -moz-box-shadow:inset 1px 1px 2px rgba(0,0,0,0.5);178 -moz-box-shadow:inset 1px 1px 2px rgba(0,0,0,0.5);
179 box-shadow:inset 1px 1px 2px rgba(0,0,0,0.5);
165 padding:5px;180 padding:5px;
166}181}
167182
@@ -199,6 +214,7 @@
199 text-shadow:0px 1px 0px white;214 text-shadow:0px 1px 0px white;
200 -webkit-border-radius:5px;215 -webkit-border-radius:5px;
201 -moz-border-radius:5px;216 -moz-border-radius:5px;
217 border-radius:5px;
202 float:left;218 float:left;
203 min-width:50px;219 min-width:50px;
204 text-align:center;220 text-align:center;
@@ -206,6 +222,7 @@
206 margin:5px;222 margin:5px;
207 -webkit-box-shadow:0px 2px 5px rgba(0,0,0,0.5);223 -webkit-box-shadow:0px 2px 5px rgba(0,0,0,0.5);
208 -moz-box-shadow:0px 2px 5px rgba(0,0,0,0.5);224 -moz-box-shadow:0px 2px 5px rgba(0,0,0,0.5);
225 box-shadow:0px 2px 5px rgba(0,0,0,0.5);
209}226}
210227
211div .button:hover{228div .button:hover{
@@ -215,6 +232,7 @@
215 cursor:pointer;232 cursor:pointer;
216 -webkit-box-shadow:0px 3px 5px rgba(0,0,0,0.6);233 -webkit-box-shadow:0px 3px 5px rgba(0,0,0,0.6);
217 -moz-box-shadow:0px 3px 5px rgba(0,0,0,0.6);234 -moz-box-shadow:0px 3px 5px rgba(0,0,0,0.6);
235 box-shadow:0px 3px 5px rgba(0,0,0,0.6);
218}236}
219237
220div .button:active{238div .button:active{
@@ -224,6 +242,7 @@
224 text-shadow:0px -1px 0px white;242 text-shadow:0px -1px 0px white;
225 -webkit-box-shadow:0px 1px 3px rgba(0,0,0,0.7);243 -webkit-box-shadow:0px 1px 3px rgba(0,0,0,0.7);
226 -moz-box-shadow:0px 1px 3px rgba(0,0,0,0.7);244 -moz-box-shadow:0px 1px 3px rgba(0,0,0,0.7);
245 box-shadow:0px 1px 3px rgba(0,0,0,0.7);
227}246}
228247
229#dim{248#dim{

Subscribers

People subscribed via source and target branches