From bcf7aa78b219a3416b23aa8863dd6a578b52f866 Mon Sep 17 00:00:00 2001
From: Zaquariah Holland
Date: Fri, 20 Aug 2021 00:00:14 -0500
Subject: [PATCH 1/5] Initial button test
- added new styling
- changed colors
---
_includes/sponsor_section.html | 3 ++-
_site/css/main.css | 4 ++++
_site/index.html | 3 ++-
_site/page2/index.html | 3 ++-
css/custom/_style.scss | 20 ++++++++++++++++++++
5 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/_includes/sponsor_section.html b/_includes/sponsor_section.html
index 4e42ba9..cf7ad63 100644
--- a/_includes/sponsor_section.html
+++ b/_includes/sponsor_section.html
@@ -2,7 +2,8 @@
Want to Sponsor ACM? Check out our packet!
- 2021 - 2022 ACM Sponsorship Packet
+
+
diff --git a/_site/css/main.css b/_site/css/main.css
index ab69a9d..abc9969 100644
--- a/_site/css/main.css
+++ b/_site/css/main.css
@@ -2310,6 +2310,10 @@ a > button { background: transparent; color: #f15a22; border: transparent; borde
a > button:hover, a > button:focus, a > button:focus-visible { color: #f15a22; box-shadow: 12px 12px 8px #888888; cursor: pointer; outline: none; }
+.main-button { color: antiquewhite !important; text-transform: uppercase; background: rgba(0, 0, 0, 0.25); padding: 20px; border: 4px solid antiquewhite !important; border-radius: 6px; display: inline-block; transition: all 0.3s ease 0s; }
+
+.main-button:hover { color: #f15a22 !important; border-radius: 50px; border-color: #f15a22 !important; transition: all 0.3s ease 0s; }
+
/* ---------------------------------- Header
----------------------------------- */
#header { height: 72px; transition: all 0.5s; z-index: 997; transition: all 0.5s; padding: 15px 0; background: #0C2340; }
diff --git a/_site/index.html b/_site/index.html
index 347d3cb..660b5ba 100644
--- a/_site/index.html
+++ b/_site/index.html
@@ -242,7 +242,8 @@ Rowdy Creators
Want to Sponsor ACM? Check out our packet!
- 2021 - 2022 ACM Sponsorship Packet
+
+
diff --git a/_site/page2/index.html b/_site/page2/index.html
index 347d3cb..660b5ba 100644
--- a/_site/page2/index.html
+++ b/_site/page2/index.html
@@ -242,7 +242,8 @@ Rowdy Creators
Want to Sponsor ACM? Check out our packet!
- 2021 - 2022 ACM Sponsorship Packet
+
+
diff --git a/css/custom/_style.scss b/css/custom/_style.scss
index 0589651..3201735 100644
--- a/css/custom/_style.scss
+++ b/css/custom/_style.scss
@@ -64,6 +64,26 @@ a > button:focus-visible {
outline: none;
}
+.main-button {
+ color: $offWhite !important;
+ text-transform: uppercase;
+ background: rgba(0,0,0,0.25);
+ padding: 20px;
+ border: 4px solid $offWhite !important;
+ border-radius: 6px;
+ display: inline-block;
+ transition: all 0.3s ease 0s;
+}
+
+.main-button:hover {
+ color: $primary !important;
+ border-radius: 50px;
+ border-color: $primary !important;
+ transition: all 0.3s ease 0s;
+}
+
+
+
/* ----------------------------------
Header
----------------------------------- */
From 9faa70125bda5ba00e11f80eb58aa4944db51315 Mon Sep 17 00:00:00 2001
From: Zaquariah Holland
Date: Fri, 20 Aug 2021 00:23:55 -0500
Subject: [PATCH 2/5] changed acmw buttons
- added animations
- changed colors
- fitted to sections
---
_includes/acmw_content.html | 63 +++++++++++++++++++++-------------
_includes/sponsor_section.html | 9 +++--
_site/css/main.css | 10 ++++--
_site/index.html | 9 +++--
_site/page2/index.html | 9 +++--
css/custom/_style.scss | 26 +++++++++++---
6 files changed, 90 insertions(+), 36 deletions(-)
diff --git a/_includes/acmw_content.html b/_includes/acmw_content.html
index a58f748..cdd6dfe 100644
--- a/_includes/acmw_content.html
+++ b/_includes/acmw_content.html
@@ -12,29 +12,46 @@ About Us
diff --git a/_includes/sponsor_section.html b/_includes/sponsor_section.html
index cf7ad63..1cc0200 100644
--- a/_includes/sponsor_section.html
+++ b/_includes/sponsor_section.html
@@ -2,8 +2,13 @@
Want to Sponsor ACM? Check out our packet!
-
-
+
diff --git a/_site/css/main.css b/_site/css/main.css
index abc9969..f93c194 100644
--- a/_site/css/main.css
+++ b/_site/css/main.css
@@ -2310,10 +2310,16 @@ a > button { background: transparent; color: #f15a22; border: transparent; borde
a > button:hover, a > button:focus, a > button:focus-visible { color: #f15a22; box-shadow: 12px 12px 8px #888888; cursor: pointer; outline: none; }
-.main-button { color: antiquewhite !important; text-transform: uppercase; background: rgba(0, 0, 0, 0.25); padding: 20px; border: 4px solid antiquewhite !important; border-radius: 6px; display: inline-block; transition: all 0.3s ease 0s; }
+.button_cont { margin-top: 20px; }
+
+.main-button { color: antiquewhite; text-transform: uppercase; background: transparent; padding: 20px; border: 4px solid antiquewhite; border-radius: 6px; display: inline-block; transition: all 0.3s ease 0s; }
.main-button:hover { color: #f15a22 !important; border-radius: 50px; border-color: #f15a22 !important; transition: all 0.3s ease 0s; }
+.button_cont p { margin-bottom: 0; }
+
+.sub-org-buttons .main-button { width: 100%; color: #0C2340; border-color: #0C2340; }
+
/* ---------------------------------- Header
----------------------------------- */
#header { height: 72px; transition: all 0.5s; z-index: 997; transition: all 0.5s; padding: 15px 0; background: #0C2340; }
@@ -2442,8 +2448,6 @@ section { padding: 60px 0; overflow: hidden; }
--------------------------------------------------------------*/
.about h3 { font-weight: 400; font-size: 34px; color: #21413c; }
-.about .icon-box { margin-top: 44px; }
-
.about .icon-box i { font-size: 48px; float: left; color: #f15a22; }
.about .icon-box h4 { font-size: 22px; font-weight: 500; margin-left: 60px; color: #21413c; }
diff --git a/_site/index.html b/_site/index.html
index 660b5ba..18d031e 100644
--- a/_site/index.html
+++ b/_site/index.html
@@ -242,8 +242,13 @@ Rowdy Creators
Want to Sponsor ACM? Check out our packet!
-
-
+
diff --git a/_site/page2/index.html b/_site/page2/index.html
index 660b5ba..18d031e 100644
--- a/_site/page2/index.html
+++ b/_site/page2/index.html
@@ -242,8 +242,13 @@ Rowdy Creators
Want to Sponsor ACM? Check out our packet!
-
-
+
diff --git a/css/custom/_style.scss b/css/custom/_style.scss
index 3201735..eb0f96d 100644
--- a/css/custom/_style.scss
+++ b/css/custom/_style.scss
@@ -64,12 +64,16 @@ a > button:focus-visible {
outline: none;
}
+.button_cont {
+ margin-top: 20px;
+}
+
.main-button {
- color: $offWhite !important;
+ color: $offWhite;
text-transform: uppercase;
- background: rgba(0,0,0,0.25);
+ background: transparent;
padding: 20px;
- border: 4px solid $offWhite !important;
+ border: 4px solid $offWhite;
border-radius: 6px;
display: inline-block;
transition: all 0.3s ease 0s;
@@ -82,6 +86,20 @@ a > button:focus-visible {
transition: all 0.3s ease 0s;
}
+//.button_cont .main-button {
+// color: $secondary !important;
+// border-color: $secondary !important;
+//}
+
+.button_cont p {
+ margin-bottom: 0;
+}
+
+.sub-org-buttons .main-button {
+ width: 100%;
+ color: $secondary;
+ border-color: $secondary;
+}
/* ----------------------------------
@@ -524,7 +542,7 @@ section {
}
.about .icon-box {
- margin-top: 44px;
+ //margin-top: 15px;
}
.about .icon-box i {
From 75978c8ab0d269a1f46e08027be338081d1b1538 Mon Sep 17 00:00:00 2001
From: Zaquariah Holland
Date: Fri, 20 Aug 2021 00:30:50 -0500
Subject: [PATCH 3/5] sponsorship packet buttons
- works correctly in each colored background
---
_includes/sponsor_perks_section.html | 7 +++++++
_site/css/main.css | 2 ++
css/custom/_style.scss | 10 +++++-----
sponsorship.html | 2 +-
4 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/_includes/sponsor_perks_section.html b/_includes/sponsor_perks_section.html
index 0fdb303..f3eed04 100644
--- a/_includes/sponsor_perks_section.html
+++ b/_includes/sponsor_perks_section.html
@@ -82,5 +82,12 @@ Sponsor ACM Today!
\ No newline at end of file
diff --git a/_site/css/main.css b/_site/css/main.css
index f93c194..8582a18 100644
--- a/_site/css/main.css
+++ b/_site/css/main.css
@@ -2318,6 +2318,8 @@ a > button:hover, a > button:focus, a > button:focus-visible { color: #f15a22; b
.button_cont p { margin-bottom: 0; }
+.perk-sponsorship .main-button { color: #0C2340; border-color: #0C2340; }
+
.sub-org-buttons .main-button { width: 100%; color: #0C2340; border-color: #0C2340; }
/* ---------------------------------- Header
diff --git a/css/custom/_style.scss b/css/custom/_style.scss
index eb0f96d..e2c06f0 100644
--- a/css/custom/_style.scss
+++ b/css/custom/_style.scss
@@ -86,15 +86,15 @@ a > button:focus-visible {
transition: all 0.3s ease 0s;
}
-//.button_cont .main-button {
-// color: $secondary !important;
-// border-color: $secondary !important;
-//}
-
.button_cont p {
margin-bottom: 0;
}
+.perk-sponsorship .main-button {
+ color: $secondary;
+ border-color: $secondary;
+}
+
.sub-org-buttons .main-button {
width: 100%;
color: $secondary;
diff --git a/sponsorship.html b/sponsorship.html
index 0446a9a..283343a 100644
--- a/sponsorship.html
+++ b/sponsorship.html
@@ -7,7 +7,7 @@
{% include sponsor_perks_section.html %}
-