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
1=== modified file 'dmedia/data/style.css'
2--- dmedia/data/style.css 2011-01-25 21:30:13 +0000
3+++ dmedia/data/style.css 2011-02-10 09:52:40 +0000
4@@ -25,10 +25,12 @@
5 padding:10px;
6 -webkit-border-radius:5px;
7 -moz-border-radius:5px;
8+ border-radius:5px;
9 background-color:rgb(182, 189, 192);
10 background:-webkit-gradient(linear, left bottom, left top, color-stop(1, rgb(238,240,240)), color-stop(0.5, rgb(182,189,192)));
11 background:-moz-linear-gradient(center bottom, rgb(182,189,192) 50%, rgb(238,240,240) 100%);
12 overflow:auto;
13+ box-shadow:inset 3px 3px 5px rgba(0,0,0,0.5);
14 /*
15 FIXME: WebKit-GTK currently has a severe performance problem when using
16 large box-shadows, so this has been disabled for now. See:
17@@ -38,7 +40,7 @@
18 https://bugs.webkit.org/show_bug.cgi?id=41031
19 */
20 /* -webkit-box-shadow:inset 3px 3px 5px rgba(0,0,0,0.5); */
21-/* -moz-box-shadow:inset 3px 3px 5px rgba(0,0,0,0.5); */
22+ -moz-box-shadow:inset 3px 3px 5px rgba(0,0,0,0.5);
23 border:1px solid #ddd;
24 }
25
26@@ -63,10 +65,12 @@
27 border-top-right-radius:0px;
28 -webkit-box-shadow:3px 3px 5px rgba(0,0,0,0.5);
29 -moz-box-shadow:3px 3px 5px rgba(0,0,0,0.5);
30+ box-shadow:3px 3px 5px rgba(0,0,0,0.5);
31 border:1px solid #ccc;
32 opacity: 1;
33+ -webkit-transform: translate(0px, 0px);
34 -moz-transform: translate(0px, 0px);
35- -webkit-transform: translate(0px, 0px);
36+ -o-transform: translate(0px, 0px);
37 }
38
39 #info.out{
40@@ -76,6 +80,7 @@
41 visibility:hidden;
42 -webkit-transform: translate(0px, -80px);
43 -moz-transform: translate(0px, -80px);
44+ -o-transform: translate(0px, -80px);
45 }
46
47 #display{
48@@ -93,12 +98,16 @@
49 height:50px;
50 width:290px;
51 -webkit-border-radius:25px;
52+ -moz-border-radius:25px;
53+ border-radius:25px;
54 border-bottom-left-radius:5px;
55 border-bottom-right-radius:5px;
56 }
57
58 .search_field{
59 -webkit-border-radius:15px;
60+ -moz-border-radius:15px;
61+ border-radius:15px;
62 border:1px solid #444;
63 height:30px;
64 width:290px;
65@@ -107,13 +116,17 @@
66 background-image:url("search.png");
67 background-repeat:no-repeat;
68 background-position:15px 3px;
69- /*-webkit-box-shadow:inset 0px 3px 10px rgba(0,0,0,0.5);*/
70+/* -webkit-box-shadow:inset 0px 3px 10px rgba(0,0,0,0.5);*/
71+ -moz-box-shadow:inset 0px 3px 10px rgba(0,0,0,0.5);
72+ box-shadow:inset 0px 3px 10px rgba(0,0,0,0.5);
73 }
74
75 #display img{
76 border:5px solid #ddd;
77 border-bottom:20px solid #ddd;
78 -webkit-box-shadow:3px 3px 10px rgba(0,0,0,0.5);
79+ -moz-box-shadow:3px 3px 10px rgba(0,0,0,0.5);
80+ box-shadow:3px 3px 10px rgba(0,0,0,0.5);
81 margin-left:auto;
82 }
83
84@@ -128,6 +141,7 @@
85 -moz-transition: border-color 1s ease;
86 -webkit-box-shadow:2px 2px 5px rgba(0, 0, 0, 0.5);
87 -moz-box-shadow:2px 2px 5px rgba(0, 0, 0, 0.5);
88+ box-shadow:2px 2px 5px rgba(0, 0, 0, 0.5);
89 margin:1px;
90 border-width:4px;
91 border-color:#222;
92@@ -162,6 +176,7 @@
93 font-family:sans-serif;
94 -webkit-box-shadow:inset 1px 1px 2px rgba(0,0,0,0.5);
95 -moz-box-shadow:inset 1px 1px 2px rgba(0,0,0,0.5);
96+ box-shadow:inset 1px 1px 2px rgba(0,0,0,0.5);
97 padding:5px;
98 }
99
100@@ -199,6 +214,7 @@
101 text-shadow:0px 1px 0px white;
102 -webkit-border-radius:5px;
103 -moz-border-radius:5px;
104+ border-radius:5px;
105 float:left;
106 min-width:50px;
107 text-align:center;
108@@ -206,6 +222,7 @@
109 margin:5px;
110 -webkit-box-shadow:0px 2px 5px rgba(0,0,0,0.5);
111 -moz-box-shadow:0px 2px 5px rgba(0,0,0,0.5);
112+ box-shadow:0px 2px 5px rgba(0,0,0,0.5);
113 }
114
115 div .button:hover{
116@@ -215,6 +232,7 @@
117 cursor:pointer;
118 -webkit-box-shadow:0px 3px 5px rgba(0,0,0,0.6);
119 -moz-box-shadow:0px 3px 5px rgba(0,0,0,0.6);
120+ box-shadow:0px 3px 5px rgba(0,0,0,0.6);
121 }
122
123 div .button:active{
124@@ -224,6 +242,7 @@
125 text-shadow:0px -1px 0px white;
126 -webkit-box-shadow:0px 1px 3px rgba(0,0,0,0.7);
127 -moz-box-shadow:0px 1px 3px rgba(0,0,0,0.7);
128+ box-shadow:0px 1px 3px rgba(0,0,0,0.7);
129 }
130
131 #dim{

Subscribers

People subscribed via source and target branches