Browse Source

Merge remote-tracking branch 'origin/dev' into dev

codecalm 3 years ago
parent
commit
4e6fa41f4f

+ 67 - 0
.github/workflows/codeql-analysis.yml

@@ -0,0 +1,67 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ dev, master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ dev ]
+  schedule:
+    - cron: '32 8 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

+ 14 - 0
src/js/src/tab.js

@@ -0,0 +1,14 @@
+import { Tab } from 'bootstrap';
+
+export const EnableActivationTabsFromLocationHash = () => {
+  const locationHash = window.location.hash;
+
+  if (locationHash) {
+	 const tabsList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tab"]'));
+	 const matchedTabs = tabsList.filter(tab => tab.hash === locationHash);
+
+	 matchedTabs.map(tab => {
+		new Tab(tab).show();
+	 });
+  }
+}

+ 2 - 0
src/js/tabler.js

@@ -6,5 +6,7 @@ import './src/dropdown';
 import './src/tooltip';
 import './src/popover';
 import './src/switch-icon';
+import { EnableActivationTabsFromLocationHash } from './src/tab';
 import './src/toast';
 
+EnableActivationTabsFromLocationHash();

+ 1 - 1
src/scss/_variables.scss

@@ -194,7 +194,7 @@ $border-width-wide: 2px !default;
 $border-radius-sm: 2px !default;
 $border-radius: 4px !default;
 $border-radius-lg: 8px !default;
-$border-radius-pill: 50% !default;
+$border-radius-pill: 100rem !default;
 
 // Avatars
 $avatar-size: 2.5rem !default;

+ 5 - 5
src/scss/utils/_colors.scss

@@ -4,12 +4,12 @@
 SOCIAL COLORS
  */
 @each $color, $value in $social-colors {
-  .bg-#{$color} {
+  .bg-#{"" + $color} {
     color: #fff !important;
     background: $value !important;
   }
 
-  .text-#{$color} {
+  .text-#{"" + $color} {
     color: $value !important;
   }
 }
@@ -17,15 +17,15 @@ SOCIAL COLORS
 
 @if $enable-extra-colors {
   @each $color, $value in map-merge($colors, (dark: $dark, muted: $text-muted, white: $white)) {
-    .bg-#{$color} {
+    .bg-#{"" + $color} {
       background: $value;
     }
 
-    .text-#{$color} {
+    .text-#{"" + $color} {
       color: $value !important;
     }
 
-    .bg-#{$color}-lt {
+    .bg-#{"" + $color}-lt {
       color: $value !important;
       background: theme-color-lighter($value, true) !important;
     }