Fix random bits and pieces, again

* Remove some use of italic fonts since that's old school * Fix glitchy render on footer * Remove some bad styling
webkom · Jul 22, 2023 · 2ec92d3 · 2ec92d3
1 parent 6c9cf4b
commit 2ec92d3
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 24 deletions.
diff --git a/app/components/Footer/Footer.css b/app/components/Footer/Footer.css
@@ -18,6 +18,7 @@
   flex-direction: row;
   justify-content: space-between;
   padding: 0.9em;
+  margin-bottom: -1px; /* In case of glitchy render */
   background: url('app/assets/skyline.svg') bottom center no-repeat;
 
   @media (--small-viewport) {

diff --git a/app/components/Poll/Poll.css b/app/components/Poll/Poll.css
@@ -74,15 +74,6 @@
   justify-content: space-between;
 }
 
-.arrow {
-  margin-top: 9px;
-  cursor: pointer;
-
-  &:hover {
-    color: var(--lego-red-color-hover);
-  }
-}
-
 .blurContainer {
   display: none;
   position: absolute;

diff --git a/app/components/Poll/index.tsx b/app/components/Poll/index.tsx
@@ -248,7 +248,6 @@ class Poll extends Component<Props, State> {
                       onClick={this.toggleTruncate}
                       name={expanded ? 'chevron-up' : 'chevron-down'}
                       size={20}
-                      className={styles.arrow}
                     />
                   </Flex>
                 )}

diff --git a/app/routes/admin/groups/components/GroupView.tsx b/app/routes/admin/groups/components/GroupView.tsx
@@ -21,15 +21,14 @@ type GroupProps = {
 
 const Group = (props: GroupProps) => {
   const { description } = props.group;
-  const descriptionText =
-    description && description.length ? `(${description})` : '';
   const { match, group } = props;
+
   return (
     <div>
       <Helmet title={props.group.name} />
       <header>
         <h2>{props.group.name}</h2>
-        <span>{descriptionText}</span>
+        <span>{description || ''}</span>
       </header>
       <Switch>
         <RouteWrapper

diff --git a/app/routes/events/components/EventEditor/EventEditor.css b/app/routes/events/components/EventEditor/EventEditor.css
@@ -11,9 +11,8 @@
 }
 
 .registrationDeadlineHours {
-  font-size: 100%;
-  margin: 0;
-  font-style: italic;
+  color: var(--secondary-font-color);
+  font-size: var(--font-size-sm);
 }
 
 .metaField {

diff --git a/app/routes/events/components/EventEditor/index.tsx b/app/routes/events/components/EventEditor/index.tsx
@@ -434,7 +434,7 @@ function EventEditor({
                   className={styles.formField}
                 />
                 <p className={styles.registrationDeadlineHours}>
-                  Stenger:{' '}
+                  Stenger{' '}
                   <FormatTime time={moment(event.registrationDeadline)} />
                 </p>
               </Tooltip>

diff --git a/app/routes/interestgroups/components/InterestGroup.css b/app/routes/interestgroups/components/InterestGroup.css
@@ -19,11 +19,6 @@
   opacity: 0.7;
 }
 
-.description {
-  font-size: var(--font-size-lg);
-  font-style: italic;
-}
-
 .listItem {
   margin: 8px;
   padding-left: 4px;

diff --git a/app/routes/interestgroups/components/InterestGroupDetail.tsx b/app/routes/interestgroups/components/InterestGroupDetail.tsx
@@ -58,7 +58,11 @@ const ButtonRow = ({
     : () => joinGroup(group.id, currentUser);
   return (
     <Flex>
-      <Button onClick={onClick}>
+      <Button
+        success={membership === undefined}
+        danger={membership !== undefined}
+        onClick={onClick}
+      >
         {membership ? 'Forlat gruppen' : 'Bli med i gruppen'}
       </Button>
     </Flex>
@@ -122,7 +126,7 @@ function InterestGroupDetail(props: Props) {
       />
       <ContentSection>
         <ContentMain>
-          <p className={styles.description}>{group.description}</p>
+          <p>{group.description}</p>
           <DisplayContent content={group.text} />
           <ButtonRow {...props} />
         </ContentMain>