Dev init

Author: gin0115

.gitignore

@@ -353,12 +353,14 @@ bh_unicode_properties.cache
 GitHub.sublime-settings
 
 ### VisualStudioCode ###
+.vscode/
 .vscode/*
-!.vscode/settings.json
+.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
 !.vscode/*.code-snippets
+themes/osi/.vscode/settings.json
 
 # Local History for Visual Studio Code
 .history/

plugins/osi-features/inc/classes/taxonomies/class-taxonomy-license-category.php

@@ -71,7 +71,10 @@ public function get_args() {
 
 		return wp_parse_args( 
 			[
-				'rewrite'      => array( 'slug' => 'license-category' ),
+				'rewrite'      => array(
+					'slug' => 'license-category',
+					'with_front' => false,
+				),
 			], 
 			parent::get_args()
 		);

plugins/osi-features/inc/classes/taxonomies/class-taxonomy-publication.php

@@ -72,7 +72,11 @@ public function get_args() {
 		return wp_parse_args( 
 			[
 				'hierarchical' => true,
-				'rewrite'      => array( 'slug' => 'publication' ),
+				'rewrite'      => array(
+					'slug' => 'publication',
+					'with_front' => false,
+				),
+
 			], 
 			parent::get_args()
 		);

plugins/osi-features/inc/classes/taxonomies/class-taxonomy-seat-type.php

@@ -72,7 +72,10 @@ public function get_args() {
 		return wp_parse_args( 
 			[
 				'hierarchical' => false,
-				'rewrite'      => array( 'slug' => 'seat-type' ),
+				'rewrite'      => array(
+					'slug' => 'seat-type',
+					'with_front' => false,
+				),
 			], 
 			parent::get_args()
 		);

plugins/osi-features/inc/classes/taxonomies/class-taxonomy-status.php

@@ -72,7 +72,11 @@ public function get_args() {
 		return wp_parse_args( 
 			[
 				'hierarchical' => false,
-				'rewrite'      => array( 'slug' => 'status' ),
+				'rewrite'      => array(
+					'slug' => 'about/board-of-directors',
+					'with_front' => false,
+					'hierarchical' => false,
+				),
 			], 
 			parent::get_args()
 		);

plugins/osi-features/inc/classes/taxonomies/class-taxonomy-steward.php

@@ -72,7 +72,10 @@ public function get_args() {
 		return wp_parse_args( 
 			[
 				'hierarchical' => false,
-				'rewrite'      => array( 'slug' => 'steward' ),
+				'rewrite'      => array(
+					'slug' => 'steward',
+					'with_front' => false,
+				),
 			], 
 			parent::get_args()
 		);

themes/osi/assets/css/editor-style.css

@@ -91,7 +91,11 @@
 
 	.single-license & {
 		.content--page article:not(.archive), .comments {
+<<<<<<< HEAD
 			max-width: $postMax !important;
+=======
+			max-width: $boxedMax !important;
+>>>>>>> origin/develop
 
 			.alignwide {
 				@extend %alignwide;

themes/osi/assets/css/editor-style.css.map

@@ -62,9 +62,18 @@
                 // all logos
                 max-width: 300px;
                 height: auto;
+<<<<<<< HEAD
                 width: 100%;
                 transform: translateZ(0); // chrome blurry fix
                 transition: all .3s;
+=======
+                width: auto;
+                transform: translateZ(0); // chrome blurry fix
+                transition: all .3s;
+                @media only screen and (max-width: #{$break-small}) {
+                    max-width: 180px;
+                }
+>>>>>>> origin/develop
             }
 
             .hide-mobile {