Skip to content

Commit

Permalink
Merge branch 'feat/rename-argilla-2-argilla-v1' into feat/argilla/def…
Browse files Browse the repository at this point in the history
…ine-new-argilla-package-and-move-argilla-to-argilla-v1
  • Loading branch information
frascuchon committed Jun 13, 2024
2 parents 6c8cada + 450bfa3 commit 2effb83
Show file tree
Hide file tree
Showing 234 changed files with 2,495 additions and 5,068 deletions.
13 changes: 12 additions & 1 deletion .github/workflows/argilla.docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,28 @@ jobs:
git config --global user.name "${{ github.actor }}"
git config --global user.email "${{ github.actor }}@users.noreply.github.com"
- name: Print GitHub ref info
run:
echo "${{ github.ref }}"
echo "${{ github.head_ref }}"

- run: pdm run mike deploy dev --push
if: github.ref == 'refs/heads/feat/v2.0.0'
# if: github.ref == 'refs/heads/develop'
env:
GH_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}

- run: pdm run mike deploy ${{ github.ref_name }} latest --update-aliases --push
if: startsWith(github.ref, 'refs/tags/')
env:
GH_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}

- name: Extract branch name
shell: bash
run: echo "branch_name=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" | sed 's/\//_/g' >> $GITHUB_OUTPUT
id: extract_branch_name

- run: pdm run mike deploy ${{ steps.extract_branch_name.outputs.branch_name }} --push
if: startsWith(github.head_ref, 'docs/')
if: startsWith(github.ref, 'refs/heads/docs') || startsWith(github.head_ref, 'docs/')
env:
GH_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,6 @@
margin: 0 auto;
padding: 4em;
}
%collapsable-if-metrics {
padding-right: calc($sidebarMenuWidth + 56px);
transition: padding 0.25s linear 0.2s;
.--metrics & {
@include media(">desktop") {
padding-right: calc($sidebarWidth + 25px);
transition: padding 0.25s linear;
}
}
}

%clear {
@include font-size(13px);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,7 @@ $swift-linear-timing-function: linear !default;
$swift-linear: all $swift-linear-duration $swift-linear-timing-function !default;

// topbar
$topbarHeight: 56px;

// sidebar
$sidebarPanelWidth: 280px;
$sidebarMenuWidth: 70px;
$sidebarWidth: $sidebarPanelWidth + $sidebarMenuWidth;
$topbarHeight: $base-space * 7;

// record
$record-reference-border-color: palette(apricot, dark);
Expand Down

This file was deleted.

Loading

0 comments on commit 2effb83

Please sign in to comment.