From 0a53027d0ce43da7505b0c2f8124af32fc4b36c8 Mon Sep 17 00:00:00 2001 From: Estelle Weyl Date: Wed, 8 Jun 2022 19:24:14 -0700 Subject: [PATCH 1/8] Minor: updates specificity weights to reflect updated tutorial --- learn/cascade/specificity-boxes.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/learn/cascade/specificity-boxes.html b/learn/cascade/specificity-boxes.html index 6af96f2f..ce5f6b3e 100644 --- a/learn/cascade/specificity-boxes.html +++ b/learn/cascade/specificity-boxes.html @@ -10,37 +10,37 @@ + + + + + +

+ A paragraph with a border and background +

+ + + + + +

+ +

+ + + + \ No newline at end of file diff --git a/learn/cascade/specificity-boxes.html b/learn/cascade/specificity-boxes.html index ce5f6b3e..f614bdcc 100644 --- a/learn/cascade/specificity-boxes.html +++ b/learn/cascade/specificity-boxes.html @@ -81,37 +81,37 @@

-/* specificity: 0101 */
+/* specificity: 1-0-1 */
 #outer a {
     background-color: red;
 }
         
-/* specificity: 0201 */
+/* specificity: 2-0-1 */
 #outer #inner a {
     background-color: blue;
 }
 
-/* specificity: 0104 */
+/* specificity: 1-0-4 */
 #outer div ul li a {
     color: yellow;
 }
 
-/* specificity: 0113 */
+/* specificity: 1-1-3 */
 #outer div ul .nav a {
     color: white;
 }
 
-/* specificity: 0024 */
+/* specificity: 0-2-4 */
 div div li:nth-child(2) a:hover {
     border: 10px solid black;
 }
 
-/* specificity: 0023 */
+/* specificity: 0-2-3 */
 div li:nth-child(2) a:hover {
     border: 10px dashed black;
 }
 
-/* specificity: 0033 */
+/* specificity: 0-3-3 */
 div div .nav:nth-child(2) a:hover {
     border: 10px double black;
 }

From 8b11c62b7ca700eb38a7f46babe4eca8730cbcc8 Mon Sep 17 00:00:00 2001
From: Estelle Weyl <estelle@openwebdocs.org>
Date: Tue, 14 Jun 2022 10:18:25 -0700
Subject: [PATCH 3/8] Apply suggestions from code review

Co-authored-by: Dipika Bhattacharya <dipika@foss-community.org>
---
 learn/cascade/cascade-layers.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/learn/cascade/cascade-layers.html b/learn/cascade/cascade-layers.html
index ec61a80a..3c1e5e68 100644
--- a/learn/cascade/cascade-layers.html
+++ b/learn/cascade/cascade-layers.html
@@ -18,12 +18,12 @@
   border: 5px inset purple;
   margin: 15px;
 }
-p#addSpecifity { /* 1-0-1 */
+p#addSpecificity { /* 1-0-1 */
   border-style: solid !important;
 }
 
 @layer firstLayer {
-  #addSpecifity { /* 1-0-0 */
+  #addSpecificity { /* 1-0-0 */
     background-color: blue;
     color: white !important;
     border-width: 5px;
@@ -32,7 +32,7 @@
 }
 
 @layer secondLayer {
-  p#addSpecifity { /* 1-0-1 */
+  p#addSpecificity { /* 1-0-1 */
     background-color: green;
     color: orange !important;
     border-width: 10px;
@@ -45,7 +45,7 @@
 
 <body>
   <section class="preview">
-        <p id="addSpecifity">
+        <p id="addSpecificity">
           A paragraph with a border and background
         </p>
   </section>
@@ -58,12 +58,12 @@
   color: grey !important;
   border: 5px inset purple;
 }
-p#addSpecifity { /* 1-0-1 */
+p#addSpecificity { /* 1-0-1 */
   border-style: solid !important;
 }
 
 @layer firstLayer {
-  #addSpecifity { /* 1-0-0 */
+  #addSpecificity { /* 1-0-0 */
     background-color: blue;
     color: white !important;
     border-width: 5px;
@@ -82,7 +82,7 @@

From b0a8255648cf6994d229d1738004c0b755507b2a Mon Sep 17 00:00:00 2001 From: Estelle Weyl Date: Tue, 14 Jun 2022 12:02:23 -0700 Subject: [PATCH 4/8] add layers to task --- learn/tasks/cascade/cascade.html | 56 ++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/learn/tasks/cascade/cascade.html b/learn/tasks/cascade/cascade.html index 5da37449..b526343c 100644 --- a/learn/tasks/cascade/cascade.html +++ b/learn/tasks/cascade/cascade.html @@ -10,15 +10,25 @@ @@ -35,17 +45,27 @@ -

From 5eae79218f2293146f26fa6e1ca455df27bd1250 Mon Sep 17 00:00:00 2001
From: Estelle Weyl <estelle@weyl.org>
Date: Tue, 14 Jun 2022 12:16:15 -0700
Subject: [PATCH 5/8] add layers to task

---
 learn/tasks/cascade/cascade.html | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/learn/tasks/cascade/cascade.html b/learn/tasks/cascade/cascade.html
index b526343c..c777fe64 100644
--- a/learn/tasks/cascade/cascade.html
+++ b/learn/tasks/cascade/cascade.html
@@ -10,19 +10,19 @@
     </style>
 
     <style class="editable">
-    @layer yellow, blue, green;
+    @layer yellow, purple, green;
 
-    @layer blue {
+    @layer yellow {
       #outer div ul .nav a {
-        background-color: blue;
+        background-color: yellow;
         padding: 5px;
         display: inline-block;
         margin-bottom: 10px;
       }
     }
-    @layer yellow {
+    @layer purple {
       div div li a {
-        color: yellow;
+        color: rebeccapurple;
       }
     }
     @layer green {
@@ -46,19 +46,19 @@
     </section>
 
     <textarea class="playable playable-css" style="height: 400px;">
-      @layer yellow, blue, green;
+      @layer yellow, purple, green;
 
-      @layer blue {
+      @layer yellow {
         #outer div ul .nav a {
-          background-color: blue;
+          background-color: yellow;
           padding: 5px;
           display: inline-block;
           margin-bottom: 10px;
         }
       }
-      @layer yellow {
+      @layer purple {
         div div li a {
-          color: yellow;
+          color: rebeccapurple;
         }
       }
       @layer green {

From 51ca33850dc58e1f3c0ec3532ac7a929ba4dcce8 Mon Sep 17 00:00:00 2001
From: Estelle Weyl <estelle@openwebdocs.org>
Date: Tue, 21 Jun 2022 17:11:48 -0700
Subject: [PATCH 6/8] typo

---
 learn/cascade/cascade-layers.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/learn/cascade/cascade-layers.html b/learn/cascade/cascade-layers.html
index 3c1e5e68..bfbec7cf 100644
--- a/learn/cascade/cascade-layers.html
+++ b/learn/cascade/cascade-layers.html
@@ -72,7 +72,7 @@
 }
 
 @layer secondLayer {
-  p#addSpecifity { /* 1-0-1 */
+  p#addSpecificity { /* 1-0-1 */
     background-color: green;
     color: orange !important;
     border-width: 10px;
@@ -93,4 +93,4 @@
 </body>
 <script src="../playable.js"></script>
 
-</html>
\ No newline at end of file
+</html>

From fad24e6fb6816da7a9845386dc36cac28a643b23 Mon Sep 17 00:00:00 2001
From: Estelle Weyl <estelle@openwebdocs.org>
Date: Wed, 22 Jun 2022 06:30:32 -0700
Subject: [PATCH 7/8] Update learn/cascade/specificity-boxes.html

Co-authored-by: Dipika Bhattacharya <dipika@foss-community.org>
---
 learn/cascade/specificity-boxes.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/learn/cascade/specificity-boxes.html b/learn/cascade/specificity-boxes.html
index f614bdcc..549e46ad 100644
--- a/learn/cascade/specificity-boxes.html
+++ b/learn/cascade/specificity-boxes.html
@@ -10,7 +10,7 @@
     </style>
 
     <style class="editable">
-/* specificity: 1-0-1 */
+/* 1. specificity: 1-0-1 */
 #outer a {
   background-color: red;
 }

From 005a46d0346bb2eafd5711c41451441dd79ffac0 Mon Sep 17 00:00:00 2001
From: Estelle Weyl <estelle@openwebdocs.org>
Date: Wed, 22 Jun 2022 06:31:55 -0700
Subject: [PATCH 8/8] Apply suggestions from code review

Co-authored-by: Dipika Bhattacharya <dipika@foss-community.org>
---
 learn/cascade/specificity-boxes.html | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/learn/cascade/specificity-boxes.html b/learn/cascade/specificity-boxes.html
index 549e46ad..5e2647e0 100644
--- a/learn/cascade/specificity-boxes.html
+++ b/learn/cascade/specificity-boxes.html
@@ -15,32 +15,32 @@
   background-color: red;
 }
 
-/* specificity: 2-0-1 */
+/* 2. specificity: 2-0-1 */
 #outer #inner a {
   background-color: blue;
 }
 
-/* specificity: 1-0-4 */
+/* 3. specificity: 1-0-4 */
 #outer div ul li a {
   color: yellow;
 }
 
-/* specificity: 1-1-3 */
+/* 4. specificity: 1-1-3 */
 #outer div ul .nav a {
   color: white;
 }
 
-/* specificity: 0-2-4 */
+/* 5. specificity: 0-2-4 */
 div div li:nth-child(2) a:hover {
   border: 10px solid black;
 }
 
-/* specificity: 0-2-3 */
+/* 6. specificity: 0-2-3 */
 div li:nth-child(2) a:hover {
   border: 10px dashed black;
 }
 
-/* specificity: 0-3-3 */
+/* 7. specificity: 0-3-3 */
 div div .nav:nth-child(2) a:hover {
   border: 10px double black;
 }
@@ -81,37 +81,37 @@
 
     <textarea class="playable playable-css" style="height: 280px;">
 
-/* specificity: 1-0-1 */
+/* 1. specificity: 1-0-1 */
 #outer a {
     background-color: red;
 }
         
-/* specificity: 2-0-1 */
+/* 2. specificity: 2-0-1 */
 #outer #inner a {
     background-color: blue;
 }
 
-/* specificity: 1-0-4 */
+/* 3. specificity: 1-0-4 */
 #outer div ul li a {
     color: yellow;
 }
 
-/* specificity: 1-1-3 */
+/* 4. specificity: 1-1-3 */
 #outer div ul .nav a {
     color: white;
 }
 
-/* specificity: 0-2-4 */
+/* 5. specificity: 0-2-4 */
 div div li:nth-child(2) a:hover {
     border: 10px solid black;
 }
 
-/* specificity: 0-2-3 */
+/* 6. specificity: 0-2-3 */
 div li:nth-child(2) a:hover {
     border: 10px dashed black;
 }
 
-/* specificity: 0-3-3 */
+/* 7. specificity: 0-3-3 */
 div div .nav:nth-child(2) a:hover {
     border: 10px double black;
 }