Merge branch 'main' into custom_padding

creativecommons · Nov 26, 2021 · 1b110ca · 1b110ca
2 parents e04d24a + ab3605a
commit 1b110ca
Show file tree

Hide file tree

Showing 15 changed files with 4 additions and 180 deletions.
diff --git a/assets/css/styles.css b/assets/css/styles.css
diff --git a/assets/images/choose_license.png b/assets/images/choose_license.png
diff --git a/assets/js/vocabulary.js b/assets/js/vocabulary.js
diff --git a/front/.gitignore b/front/.gitignore
diff --git a/front/assets/css/styles.css b/front/assets/css/styles.css
diff --git a/front/dist/js/bundle.js b/front/dist/js/bundle.js
diff --git a/front/package.json b/front/package.json
diff --git a/front/src/index.js b/front/src/index.js
diff --git a/front/src/styles/base.scss b/front/src/styles/base.scss
diff --git a/front/src/styles/mixins.scss b/front/src/styles/mixins.scss
diff --git a/front/src/styles/modules.scss b/front/src/styles/modules.scss
diff --git a/front/src/styles/styles.scss b/front/src/styles/styles.scss
diff --git a/front/src/styles/widgets.scss b/front/src/styles/widgets.scss
diff --git a/front/webpack.config.js b/front/webpack.config.js
diff --git a/functions.php b/functions.php
@@ -53,18 +53,17 @@ public function add_global_menu($parent_menus) {
 	 * */
 	public function actions_manager() {
 		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
 		add_filter( 'cc_theme_base_menus', array( $this, 'add_global_menu') );
 		add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
 	}
-	public function enqueue_scripts() {
-		wp_enqueue_script( 'vocabulary', THEME_LOCAL_URI . '/assets/js/vocabulary.js', '', self::theme_ver, true );
-	}
+
 	public function admin_enqueue_scripts() {
 		wp_enqueue_script( 'custom-block-settings', THEME_LOCAL_URI . '/custom-block-settings.js', '', self::theme_ver, true );
 	}
+
 	public function enqueue_styles() {
-		wp_enqueue_style( 'cc_current_style', THEME_LOCAL_URI . '/assets/css/styles.css', self::theme_ver );
+		wp_enqueue_style( 'cc_current_style', THEME_LOCAL_URI . '/style.css', self::theme_ver );
+
 	}
 }