From be45c95e2488a588831b95de902621c839297aa2 Mon Sep 17 00:00:00 2001 From: Konstantinos Tsilimparis Date: Wed, 18 Sep 2024 15:10:21 +0200 Subject: [PATCH 01/23] Deleting files that failed during cloning script .md and reproducescript .md have a space between the name of the file and the file extension. Thus I cannot clone them in my local windows machine. --- "tag/reproducescript\r.md" | 4 ---- "tag/script\r.md" | 4 ---- 2 files changed, 8 deletions(-) delete mode 100644 "tag/reproducescript\r.md" delete mode 100644 "tag/script\r.md" diff --git "a/tag/reproducescript\r.md" "b/tag/reproducescript\r.md" deleted file mode 100644 index 9f18a513b..000000000 --- "a/tag/reproducescript\r.md" +++ /dev/null @@ -1,4 +0,0 @@ ---- -layout: tag -tag: reproducescript ---- diff --git "a/tag/script\r.md" "b/tag/script\r.md" deleted file mode 100644 index 5e6335c47..000000000 --- "a/tag/script\r.md" +++ /dev/null @@ -1,4 +0,0 @@ ---- -layout: tag -tag: script ---- From e9de677b31cb8d313681bcc84e504c4c0a09e03e Mon Sep 17 00:00:00 2001 From: Konstantinos Tsilimparis Date: Wed, 18 Sep 2024 15:28:41 +0200 Subject: [PATCH 02/23] Create why_should_I_set_cfg.continuous_equal_to_yes_when_preprocessing_ctf_trial_based_data.md --- ...ual_to_yes_when_preprocessing_ctf_trial_based_data.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 faq/why_should_I_set_cfg.continuous_equal_to_yes_when_preprocessing_ctf_trial_based_data.md diff --git a/faq/why_should_I_set_cfg.continuous_equal_to_yes_when_preprocessing_ctf_trial_based_data.md b/faq/why_should_I_set_cfg.continuous_equal_to_yes_when_preprocessing_ctf_trial_based_data.md new file mode 100644 index 000000000..4b6a29545 --- /dev/null +++ b/faq/why_should_I_set_cfg.continuous_equal_to_yes_when_preprocessing_ctf_trial_based_data.md @@ -0,0 +1,9 @@ +--- +title: Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? +tags: [faq, ctf, preprocessing] +--- + +# Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? + +When storing a continuous CTF recording in disk, the CTF acquisition software automatically adds a trigger every 10 seconds alongside your custom triggers. To virtually stitch together these 10-second segments into one continuous recording , you must set cfg.continuous = 'yes' in **[ft_preprocessing](/reference/ft_preprocessing)**. That way you can perform trial-based MEG analysis using your custom triggers. This is also done in the [Preprocessing - Segmenting and reading trial-based EEG and MEG data](tutorial/preprocessing) tutorial. + From b218eacc3fdd4bc85e03fe8b59c6b9a74efcbb3f Mon Sep 17 00:00:00 2001 From: Robert Oostenveld Date: Thu, 19 Sep 2024 09:26:11 +0200 Subject: [PATCH 03/23] renamed and updated --- faq/continuous.md | 18 ++++++++++++++++++ ..._when_preprocessing_ctf_trial_based_data.md | 9 --------- 2 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 faq/continuous.md delete mode 100644 faq/why_should_I_set_cfg.continuous_equal_to_yes_when_preprocessing_ctf_trial_based_data.md diff --git a/faq/continuous.md b/faq/continuous.md new file mode 100644 index 000000000..06a1fa91f --- /dev/null +++ b/faq/continuous.md @@ -0,0 +1,18 @@ +--- +title: Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? +tags: [faq, ctf, preprocessing, continuous] +--- + +# Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? + +The CTF acquisition software by default writes data to disk in blocks. The length of these blocks can be configured, and at the DCCN this is set to 10 seconds. So the continuous recording is actually pseudo-continuous and consists of blocks of 10 seconds, where block N is followed smoothly without gaps by block N+1. However, the CTF acquisition software can also be configured to only write a block of data to disk upon a trigger. This results in "epoched" data, where only the data corresponding to the trial is written to disk and the data in the inter trial intervals is not. In this case there is a gap between block N and block N+1. If you were to read the epoched data as if it were continuously, you won't see the gaps as such along the time axis, but you will see jumps in the data as the signal may have drifted from block N to block N+1. + +FieldTrip does not distinguish between the CTF files that are written as blocks in continuous mode, without gaps, and CTF files that are written as epochs with gaps between the blocks. The low-level reading functions by default will give an error when you try to read data that extends over a boundary between two blocks, but the `cfg.continuous` option in **[ft_preprocessing](/reference/ft_preprocessing)** allows you to override that. + +The "Subject01.ds" CTF dataset that is used in some tutorials is epoched and has gaps between the trials. If you were to read that as continuous, you would see discontinuities in the MEG channels. If you were to apply the automatic artifact detection functions on that as continuous data, many trials would be detected as an artifact as they start/end with a discontinuous jump in some of the channels. Hence when reading that data the `cfg.continuous` option should be set to `"no"` (which is the default). + +Many other CTF datasets are recorded as pseudocontinuous without gaps between the blocks and for those you do want to set the `cfg.continuous` option to `"yes"`. + +To check whether your data is epoched or pseudocontinuous, please have a look at the `SCLK01` channel. + +Note that besides **[ft_preprocessing](/reference/ft_preprocessing)**, other functions that read data from disk also have the `cfg.continuous` option, such as **[ft_databrowser](/reference/ft_databrowser)** and the automatic artifact detection functions. diff --git a/faq/why_should_I_set_cfg.continuous_equal_to_yes_when_preprocessing_ctf_trial_based_data.md b/faq/why_should_I_set_cfg.continuous_equal_to_yes_when_preprocessing_ctf_trial_based_data.md deleted file mode 100644 index 4b6a29545..000000000 --- a/faq/why_should_I_set_cfg.continuous_equal_to_yes_when_preprocessing_ctf_trial_based_data.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -title: Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? -tags: [faq, ctf, preprocessing] ---- - -# Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? - -When storing a continuous CTF recording in disk, the CTF acquisition software automatically adds a trigger every 10 seconds alongside your custom triggers. To virtually stitch together these 10-second segments into one continuous recording , you must set cfg.continuous = 'yes' in **[ft_preprocessing](/reference/ft_preprocessing)**. That way you can perform trial-based MEG analysis using your custom triggers. This is also done in the [Preprocessing - Segmenting and reading trial-based EEG and MEG data](tutorial/preprocessing) tutorial. - From 1f778df6221d47e89a9f66f2d6f09dd34ed93a45 Mon Sep 17 00:00:00 2001 From: Konstantinos Tsilimparis Date: Thu, 19 Sep 2024 19:55:27 +0200 Subject: [PATCH 04/23] update faq.md and add link to the preprocessing tutorial --- faq.md | 1 + tutorial/preprocessing.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/faq.md b/faq.md index 2d9da461f..7f8c064b2 100644 --- a/faq.md +++ b/faq.md @@ -17,6 +17,7 @@ See also the [tutorials](/tutorial) and [example scripts](/example). - [How can I inspect the electrode impedances of my data?](/faq/how_can_i_inspect_the_electrode_impedances_of_my_data) - [Should I rereference my EEG data prior to, or after ICA?](/faq/should_I_rereference_prior_to_or_after_ica_for_artifact_removal) - [I used to work with trl-matrices that have more than 3 columns. Why is this not supported anymore?](/faq/i_used_to_work_with_trl-matrices_that_have_more_than_3_columns._why_is_this_not_supported_anymore) +- [Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data?](/faq/continuous) ### Specific data formats diff --git a/tutorial/preprocessing.md b/tutorial/preprocessing.md index 2e4180a90..ad40b39f7 100644 --- a/tutorial/preprocessing.md +++ b/tutorial/preprocessing.md @@ -49,7 +49,7 @@ This results in a cfg.trl that contains the trial definitions of all conditions The output of **[ft_definetrial](/reference/ft_definetrial)** can be used for **[ft_preprocessing](/reference/ft_preprocessing)**. cfg.channel = {'MEG' 'EOG'}; - cfg.continuous = 'yes'; + cfg.continuous = 'yes'; % see https://www.fieldtriptoolbox.org/faq/continuous/ data_all = ft_preprocessing(cfg); Save the data to disk From 72c6ef68eaea1898094d2a75797d4c0679a1f358 Mon Sep 17 00:00:00 2001 From: Robert Oostenveld Date: Fri, 20 Sep 2024 11:52:13 +0200 Subject: [PATCH 05/23] include authors in the header --- faq/continuous.md | 1 + 1 file changed, 1 insertion(+) diff --git a/faq/continuous.md b/faq/continuous.md index 06a1fa91f..d761fa16a 100644 --- a/faq/continuous.md +++ b/faq/continuous.md @@ -1,6 +1,7 @@ --- title: Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? tags: [faq, ctf, preprocessing, continuous] +authors: [Konstantinos Tsilimparis, Robert Oostenveld] --- # Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? From b4b8e48524d979cdd025cacd91887e344a379bf3 Mon Sep 17 00:00:00 2001 From: Robert Oostenveld Date: Fri, 20 Sep 2024 11:53:40 +0200 Subject: [PATCH 06/23] updated tags --- _data/tag/continuous.yml | 3 +++ _data/tag/ctf.yml | 3 +++ _data/tag/faq.yml | 3 +++ _data/tag/preprocessing.yml | 3 +++ "tag/reproducescript\r.md" | 4 ++++ "tag/script\r.md" | 4 ++++ 6 files changed, 20 insertions(+) create mode 100644 "tag/reproducescript\r.md" create mode 100644 "tag/script\r.md" diff --git a/_data/tag/continuous.yml b/_data/tag/continuous.yml index fa36cbf47..65acddef6 100644 --- a/_data/tag/continuous.yml +++ b/_data/tag/continuous.yml @@ -1,3 +1,6 @@ +- name: Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? + link: /faq/continuous + - name: How can I do time-frequency analysis on continuous data? link: /faq/how_can_i_do_time-frequency_analysis_on_continuous_data diff --git a/_data/tag/ctf.yml b/_data/tag/ctf.yml index 0f7fef3e1..e266cf351 100644 --- a/_data/tag/ctf.yml +++ b/_data/tag/ctf.yml @@ -16,6 +16,9 @@ - name: Can I create an artificial CTF dataset using MATLAB? link: /example/writing_simulated_data_to_a_ctf_dataset +- name: Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? + link: /faq/continuous + - name: How are the Left and Right Pre-Auricular (LPA and RPA) points defined? link: /faq/how_are_the_lpa_and_rpa_points_defined diff --git a/_data/tag/faq.yml b/_data/tag/faq.yml index 612b7bd7a..c8f65fe72 100644 --- a/_data/tag/faq.yml +++ b/_data/tag/faq.yml @@ -52,6 +52,9 @@ - name: Can I use FieldTrip without MATLAB license? link: /faq/compiled +- name: Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? + link: /faq/continuous + - name: How are the different head and MRI coordinate systems defined? link: /faq/coordsys diff --git a/_data/tag/preprocessing.yml b/_data/tag/preprocessing.yml index 65f16b018..38c5d575a 100644 --- a/_data/tag/preprocessing.yml +++ b/_data/tag/preprocessing.yml @@ -31,6 +31,9 @@ - name: How can I append the files of two separate recordings? link: /faq/append_files +- name: Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? + link: /faq/continuous + - name: What dataformats are supported? link: /faq/dataformat diff --git "a/tag/reproducescript\r.md" "b/tag/reproducescript\r.md" new file mode 100644 index 000000000..9f18a513b --- /dev/null +++ "b/tag/reproducescript\r.md" @@ -0,0 +1,4 @@ +--- +layout: tag +tag: reproducescript +--- diff --git "a/tag/script\r.md" "b/tag/script\r.md" new file mode 100644 index 000000000..5e6335c47 --- /dev/null +++ "b/tag/script\r.md" @@ -0,0 +1,4 @@ +--- +layout: tag +tag: script +--- From b0939a64107538bdbbc6ae29b126124f66c2d6b3 Mon Sep 17 00:00:00 2001 From: Robert Oostenveld Date: Fri, 20 Sep 2024 12:03:24 +0200 Subject: [PATCH 07/23] point to new FAQ for cfg.continuous, see #806 --- development/project/integrate_with_mne.md | 2 +- example/headmovement_meg.md | 4 ++-- example/reproducescript.md | 2 +- example/reproducescript_group.md | 2 +- getting_started/mne.md | 2 +- tutorial/automatic_artifact_rejection.md | 15 ++++++--------- tutorial/ica_artifact_cleaning.md | 2 +- tutorial/networkanalysis.md | 4 ++-- tutorial/tms-eeg.md | 2 +- walkthrough.md | 16 ++++++++-------- workshop/oxford2019/sensor_analysis_plusminus.md | 5 ++--- 11 files changed, 26 insertions(+), 30 deletions(-) diff --git a/development/project/integrate_with_mne.md b/development/project/integrate_with_mne.md index bc1526e4b..2c67010b4 100644 --- a/development/project/integrate_with_mne.md +++ b/development/project/integrate_with_mne.md @@ -51,7 +51,7 @@ First, we read the data as a continuous chunk. Note that the example dataset use cfg.trialdef.length = Inf; cfg = ft_definetrial(cfg); - cfg.continuous = 'yes'; + cfg.continuous = 'yes'; % see https://www.fieldtriptoolbox.org/faq/continuous/ cfg.channel = {'MEG', '-MLP31', '-MLO12'}; data = ft_preprocessing(cfg); diff --git a/example/headmovement_meg.md b/example/headmovement_meg.md index 7289269b7..2f1cea479 100644 --- a/example/headmovement_meg.md +++ b/example/headmovement_meg.md @@ -102,7 +102,7 @@ MEG experiments typically involve repeated trials of an evoked or induced brain cfg.trialdef.eventvalue = 4; cfg.trialdef.prestim = 0.2; cfg.trialdef.poststim = 0.3; - cfg.continuous = 'yes'; + cfg.continuous = 'yes'; % see https://www.fieldtriptoolbox.org/faq/continuous/ cfg = ft_definetrial(cfg); % preprocess the MEG data @@ -128,7 +128,7 @@ MEG experiments typically involve repeated trials of an evoked or induced brain cfg.trialdef.eventvalue = 4; cfg.trialdef.prestim = 0.2; cfg.trialdef.poststim = 0.3; - cfg.continuous = 'yes'; + cfg.continuous = 'yes'; % see https://www.fieldtriptoolbox.org/faq/continuous/ cfg = ft_definetrial(cfg); % preprocess the headposition data diff --git a/example/reproducescript.md b/example/reproducescript.md index faf6787fd..214ed889c 100644 --- a/example/reproducescript.md +++ b/example/reproducescript.md @@ -46,7 +46,7 @@ To show how the reproducescript functionality works, we apply it to a script fro % loading data and basic preprocessing cfg.channel = {'MEG' 'EOG'}; - cfg.continuous = 'yes'; + cfg.continuous = 'yes'; % see https://www.fieldtriptoolbox.org/faq/continuous/ dataFIC = ft_preprocessing(cfg); % time-lock analysis diff --git a/example/reproducescript_group.md b/example/reproducescript_group.md index 7ea454992..b5d561cd8 100644 --- a/example/reproducescript_group.md +++ b/example/reproducescript_group.md @@ -71,7 +71,7 @@ This is the control script from which the relevant analysis scripts and function % the EOG channel has a different name in the different datasets cfg.channel = {'MEG' eogchannel}; - cfg.continuous = 'yes'; + cfg.continuous = 'yes'; % see https://www.fieldtriptoolbox.org/faq/continuous/ data = ft_preprocessing(cfg); %% diff --git a/getting_started/mne.md b/getting_started/mne.md index c50a2da50..a7dce3d33 100644 --- a/getting_started/mne.md +++ b/getting_started/mne.md @@ -47,7 +47,7 @@ As a first example, we read the data as a continuous chunk. Note that the exampl cfg.trialdef.length = Inf; cfg = ft_definetrial(cfg); - cfg.continuous = 'yes'; + cfg.continuous = 'yes'; % see https://www.fieldtriptoolbox.org/faq/continuous/ cfg.channel = {'MEG', '-MLP31', '-MLO12'}; data = ft_preprocessing(cfg); hs = ft_read_headshape(cfg.dataset); % let's also read this information diff --git a/tutorial/automatic_artifact_rejection.md b/tutorial/automatic_artifact_rejection.md index 7998496a0..1604fa587 100644 --- a/tutorial/automatic_artifact_rejection.md +++ b/tutorial/automatic_artifact_rejection.md @@ -177,9 +177,8 @@ For detecting jump artifacts, begin with the following parameter % jump cfg = []; cfg.trl = trl; - cfg.datafile = 'ArtifactMEG.ds'; - cfg.headerfile = 'ArtifactMEG.ds'; - cfg.continuous = 'yes'; + cfg.dataset = 'ArtifactMEG.ds'; + cfg.continuous = 'yes'; % see https://www.fieldtriptoolbox.org/faq/continuous/ % channel selection, cutoff and padding cfg.artfctdef.zvalue.channel = 'MEG'; @@ -226,9 +225,8 @@ The same way as **[ft_artifact_zvalue](/reference/ft_artifact_zvalue)** is used % muscle cfg = []; cfg.trl = trl; - cfg.datafile = 'ArtifactMEG.ds'; - cfg.headerfile = 'ArtifactMEG.ds'; - cfg.continuous = 'yes'; + cfg.dataset = 'ArtifactMEG.ds'; + cfg.continuous = 'yes'; % see https://www.fieldtriptoolbox.org/faq/continuous/ % channel selection, cutoff and padding cfg.artfctdef.zvalue.channel = 'MRT*'; @@ -262,9 +260,8 @@ Note that only the EOG is scanned in the eye artifacts case, which will take les % EOG cfg = []; cfg.trl = trl; - cfg.datafile = 'ArtifactMEG.ds'; - cfg.headerfile = 'ArtifactMEG.ds'; - cfg.continuous = 'yes'; + cfg.dataset = 'ArtifactMEG.ds'; + cfg.continuous = 'yes'; % see https://www.fieldtriptoolbox.org/faq/continuous/ % channel selection, cutoff and padding cfg.artfctdef.zvalue.channel = 'EOG'; diff --git a/tutorial/ica_artifact_cleaning.md b/tutorial/ica_artifact_cleaning.md index 7500d2c6e..6acf99cd4 100644 --- a/tutorial/ica_artifact_cleaning.md +++ b/tutorial/ica_artifact_cleaning.md @@ -43,7 +43,7 @@ To load this dataset into MATLAB and preprocess with FieldTrip, use: cfg = []; cfg.dataset = 'ArtifactMEG.ds'; - cfg.continuous = 'yes'; + cfg.continuous = 'yes'; % see https://www.fieldtriptoolbox.org/faq/continuous/ cfg.hpfilter = 'yes'; cfg.hpfreq = 0.1; % this is for later segmenting, see below cfg.hpfiltord = 2; diff --git a/tutorial/networkanalysis.md b/tutorial/networkanalysis.md index d6bb74c30..1cbf277bc 100644 --- a/tutorial/networkanalysis.md +++ b/tutorial/networkanalysis.md @@ -43,8 +43,8 @@ The ft_redefinetrial and ft_preprocessing functions require the original MEG dat %% read the continuous data and segment into 2 seconds epochs cfg = []; - cfg.dataset = 'SubjectRest.ds'; % note that you may need to add the full path to the .ds directory - cfg.continuous = 'yes'; + cfg.dataset = 'SubjectRest.ds'; % you may need to add the full path + cfg.continuous = 'yes'; % see https://www.fieldtriptoolbox.org/faq/continuous/ cfg.channel = {'MEG'}; data = ft_preprocessing(cfg); diff --git a/tutorial/tms-eeg.md b/tutorial/tms-eeg.md index 1d1c3569a..b537e0b72 100644 --- a/tutorial/tms-eeg.md +++ b/tutorial/tms-eeg.md @@ -362,7 +362,7 @@ Using **[ft_databrowser](/reference/ft_databrowser)** we can browse through both % Browse through the segmented data cfg = []; cfg.artfctdef = cfg_artifact.artfctdef; % Store previously obtained artifact definition - cfg.continuous = 'yes'; % Setting this to yes forces ft_databrowser to represent our segmented data as one continuous signal + cfg.continuous = 'yes'; % represent the segments or trials as continuous data ft_databrowser(cfg, data_tms_segmented); {% include image src="/assets/img/tutorial/tms-eeg/figure12.png" %} diff --git a/walkthrough.md b/walkthrough.md index 8be576dca..352785ccd 100644 --- a/walkthrough.md +++ b/walkthrough.md @@ -164,12 +164,12 @@ Finding an appropriate approach to artifact rejection is not as simple as one mi Of course, in the end you would like to have certain standardized approach to your artifact rejection that will give you the best results possible. I don't know if something like that exists and rather think everyone has his or her own personal preferences. Although seemingly rather time-consuming, I myself ended up with the following procedure. You need not follow it, it's just a suggestion. It does give me the possibility of explaining some of the following steps in more detail. In particular it will explain a use of ft_databrowser, a recently added function which is not yet documented elsewhere. -1. Visually inspect the dataset and mark those segments that contain obvious movements, (system) spikes or muscle artifacts, leaving in all but the most extreme eye artifacts. -2. Reject the trials that contain artifacts. -3. Decompose the data using ICA. Note that ICA can give very unreliable results when the data contains a lot of (correlated) noise. The cleaner the data is already, the better the ICA results. -4. Find components clearly corresponding to eye blinks and saccades. -5. Recompose data without those components. -6. Go through data again visually and manually selects segments that still show any remaining artifacts, being from eye blinks, movements, etc. +1. Visually inspect the dataset and mark those segments that contain obvious movements, (system) spikes or muscle artifacts, leaving in all but the most extreme eye artifacts. +2. Reject the trials that contain artifacts. +3. Decompose the data using ICA. Note that ICA can give very unreliable results when the data contains a lot of (correlated) noise. The cleaner the data is already, the better the ICA results. +4. Find components clearly corresponding to eye blinks and saccades. +5. Recompose data without those components. +6. Go through data again visually and manually selects segments that still show any remaining artifacts, being from eye blinks, movements, etc. I know this looks like a lot of work. However, it might pay off in the end when you are certain your data is clean and you do not have to go back to satisfy that slightly uneasy feeling that your results might 'be all artifacts'. Of course they might still be, but at least you did everything you could. @@ -204,7 +204,7 @@ First we need to decompose the data into independent components. The only thing cfg = \[]; cfg.channel = 'EEG'; - ic_data = ft_componentanalysis(cfg,cleandata); + ic_data = ft_componentanalysis(cfg, cleandata); The ICA will return as many components as you put channels in. Each component consists of a component timecourse for every trial (ic_data.trial) together with a single topography (ic_data.topo @@ -217,7 +217,7 @@ When ft_componentanalysis is done (it could take a while) we have to find those cfg.continuous = 'yes'; cfg.blocksize = 30; cfg.channels = [1:10]; - ft_databrowser(cfg,ic_data);  + ft_databrowser(cfg, ic_data);  Components are automatically sorted based upon on the sum of the weighting factors, commonly resulting in the most interesting components appearing on top. In the example below the first component is clearly an eye-blink because the appearance of an eye-blink in the time-course and the frontal topography. The second component is most probably related to eye movements for similar reasons. The fourth component is picking up the heartbeat. There is no reason to assume the third component to be artifactual. diff --git a/workshop/oxford2019/sensor_analysis_plusminus.md b/workshop/oxford2019/sensor_analysis_plusminus.md index 38d86e086..05470d361 100644 --- a/workshop/oxford2019/sensor_analysis_plusminus.md +++ b/workshop/oxford2019/sensor_analysis_plusminus.md @@ -49,9 +49,8 @@ We will demonstrate reading in data based on the localizer task for the experime Note that we're taking the output of `ft_definetrial` and storing it in our `cfg` variable. The output `cfg` now additionally has a field `cfg.trl` that contains our trial definition. Using the created trial definition, we can add some preprocessing options and read in the data: - % the following tells the reading functions that the data on disk is - % continuous and not already segmented - cfg.continuous = 'yes'; + % the following tells the reading functions that the data on disk is continuous and not already segmented + cfg.continuous = 'yes'; % see https://www.fieldtriptoolbox.org/faq/continuous/ cfg.channel = {'MEG' 'EMGlft' 'EMGrgt' 'EOG' 'ECG'}; From f1a54503fa435575373d5acb099b3bcad7056ec9 Mon Sep 17 00:00:00 2001 From: Robert Oostenveld Date: Fri, 20 Sep 2024 12:07:41 +0200 Subject: [PATCH 08/23] shortened page title --- faq.md | 2 +- faq/continuous.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/faq.md b/faq.md index 7f8c064b2..1bd672f04 100644 --- a/faq.md +++ b/faq.md @@ -17,7 +17,7 @@ See also the [tutorials](/tutorial) and [example scripts](/example). - [How can I inspect the electrode impedances of my data?](/faq/how_can_i_inspect_the_electrode_impedances_of_my_data) - [Should I rereference my EEG data prior to, or after ICA?](/faq/should_I_rereference_prior_to_or_after_ica_for_artifact_removal) - [I used to work with trl-matrices that have more than 3 columns. Why is this not supported anymore?](/faq/i_used_to_work_with_trl-matrices_that_have_more_than_3_columns._why_is_this_not_supported_anymore) -- [Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data?](/faq/continuous) +- [Why should I set continuous to yes for CTF data?](/faq/continuous) ### Specific data formats diff --git a/faq/continuous.md b/faq/continuous.md index d761fa16a..801758e61 100644 --- a/faq/continuous.md +++ b/faq/continuous.md @@ -1,10 +1,10 @@ --- -title: Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? +title: Why should I set continuous to yes for CTF data? tags: [faq, ctf, preprocessing, continuous] authors: [Konstantinos Tsilimparis, Robert Oostenveld] --- -# Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? +# Why should I set continuous to yes for CTF data? The CTF acquisition software by default writes data to disk in blocks. The length of these blocks can be configured, and at the DCCN this is set to 10 seconds. So the continuous recording is actually pseudo-continuous and consists of blocks of 10 seconds, where block N is followed smoothly without gaps by block N+1. However, the CTF acquisition software can also be configured to only write a block of data to disk upon a trigger. This results in "epoched" data, where only the data corresponding to the trial is written to disk and the data in the inter trial intervals is not. In this case there is a gap between block N and block N+1. If you were to read the epoched data as if it were continuously, you won't see the gaps as such along the time axis, but you will see jumps in the data as the signal may have drifted from block N to block N+1. From a715deb62d3b6cbd3b18fddf783d52ca03079740 Mon Sep 17 00:00:00 2001 From: Robert Oostenveld Date: Fri, 20 Sep 2024 12:09:53 +0200 Subject: [PATCH 09/23] updated tags --- _data/tag/continuous.yml | 2 +- _data/tag/ctf.yml | 2 +- _data/tag/faq.yml | 2 +- _data/tag/preprocessing.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_data/tag/continuous.yml b/_data/tag/continuous.yml index 65acddef6..f33ef5d41 100644 --- a/_data/tag/continuous.yml +++ b/_data/tag/continuous.yml @@ -1,4 +1,4 @@ -- name: Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? +- name: Why should I set continuous to yes for CTF data? link: /faq/continuous - name: How can I do time-frequency analysis on continuous data? diff --git a/_data/tag/ctf.yml b/_data/tag/ctf.yml index e266cf351..3796acdb0 100644 --- a/_data/tag/ctf.yml +++ b/_data/tag/ctf.yml @@ -16,7 +16,7 @@ - name: Can I create an artificial CTF dataset using MATLAB? link: /example/writing_simulated_data_to_a_ctf_dataset -- name: Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? +- name: Why should I set continuous to yes for CTF data? link: /faq/continuous - name: How are the Left and Right Pre-Auricular (LPA and RPA) points defined? diff --git a/_data/tag/faq.yml b/_data/tag/faq.yml index c8f65fe72..1c6bac68b 100644 --- a/_data/tag/faq.yml +++ b/_data/tag/faq.yml @@ -52,7 +52,7 @@ - name: Can I use FieldTrip without MATLAB license? link: /faq/compiled -- name: Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? +- name: Why should I set continuous to yes for CTF data? link: /faq/continuous - name: How are the different head and MRI coordinate systems defined? diff --git a/_data/tag/preprocessing.yml b/_data/tag/preprocessing.yml index 38c5d575a..1ecdd5af1 100644 --- a/_data/tag/preprocessing.yml +++ b/_data/tag/preprocessing.yml @@ -31,7 +31,7 @@ - name: How can I append the files of two separate recordings? link: /faq/append_files -- name: Why should I set cfg.continuous = 'yes' when preprocessing CTF trial-based data? +- name: Why should I set continuous to yes for CTF data? link: /faq/continuous - name: What dataformats are supported? From 9cb0fad62e77254a32f4ecbd389f1b21259ea4e5 Mon Sep 17 00:00:00 2001 From: Robert Oostenveld Date: Sat, 21 Sep 2024 03:45:11 +0200 Subject: [PATCH 10/23] added papers from Pubmed that cite FieldTrip --- _data/citedby/11383615.yml | 29 ++++++++++++++++++ _data/citedby/11406071.yml | 37 +++++++++++++++++++++++ _data/citedby/11407023.yml | 26 ++++++++++++++++ _data/citedby/11408537.yml | 39 ++++++++++++++++++++++++ _data/citedby/11408544.yml | 31 +++++++++++++++++++ _data/citedby/11410217.yml | 61 ++++++++++++++++++++++++++++++++++++++ _data/citedby/11410353.yml | 24 +++++++++++++++ _data/citedby/11410390.yml | 24 +++++++++++++++ 8 files changed, 271 insertions(+) create mode 100644 _data/citedby/11383615.yml create mode 100644 _data/citedby/11406071.yml create mode 100644 _data/citedby/11407023.yml create mode 100644 _data/citedby/11408537.yml create mode 100644 _data/citedby/11408544.yml create mode 100644 _data/citedby/11410217.yml create mode 100644 _data/citedby/11410353.yml create mode 100644 _data/citedby/11410390.yml diff --git a/_data/citedby/11383615.yml b/_data/citedby/11383615.yml new file mode 100644 index 000000000..50e8c0a7a --- /dev/null +++ b/_data/citedby/11383615.yml @@ -0,0 +1,29 @@ +articleids: +- idtype: pmid + value: '38842507' +- idtype: doi + value: 10.1152/jn.00264.2023 +- idtype: pmcid + value: PMC11383615 +authors: +- authtype: Author + name: Hoffman SJ +- authtype: Author + name: Dotson NM +- authtype: Author + name: Lima V +- authtype: Author + name: Gray CM +epubdate: 2024 Jun 6 +fulljournalname: Journal of Neurophysiology +issue: '1' +pages: 206-225 +pmclivedate: '' +printpubdate: 2024 Jul 1 +pubdate: 2024 Jun 6 +sortdate: 2024/06/06 00:00 +source: J Neurophysiol +title: The primate cortical LFP exhibits multiple spectral and temporal gradients + and widespread task dependence during visual short-term memory +uid: '11383615' +volume: '132' diff --git a/_data/citedby/11406071.yml b/_data/citedby/11406071.yml new file mode 100644 index 000000000..ae3950c71 --- /dev/null +++ b/_data/citedby/11406071.yml @@ -0,0 +1,37 @@ +articleids: +- idtype: pmid + value: '39290840' +- idtype: doi + value: 10.1016/j.isci.2024.110738 +- idtype: pmcid + value: PMC11406071 +authors: +- authtype: Author + name: Sajovic J +- authtype: Author + name: Drevenšek G +- authtype: Author + name: Plut A +- authtype: Author + name: Eberlinc A +- authtype: Author + name: Kosmač Vrabec M +- authtype: Author + name: Setnikar Lesjak A +- authtype: Author + name: Selič Zupančič P +- authtype: Author + name: Drevenšek M +epubdate: 2024 Aug 21 +fulljournalname: iScience +issue: '9' +pages: '110738' +pmclivedate: 2024/09/17 +printpubdate: '' +pubdate: 2024 Aug 21 +sortdate: 2024/08/21 00:00 +source: iScience +title: 'Beyond the face: An interdisciplinary evaluation of satisfaction with appearance + in young people with orofacial clefts' +uid: '11406071' +volume: '27' diff --git a/_data/citedby/11407023.yml b/_data/citedby/11407023.yml new file mode 100644 index 000000000..a9a3af227 --- /dev/null +++ b/_data/citedby/11407023.yml @@ -0,0 +1,26 @@ +articleids: +- idtype: pmid + value: '39290842' +- idtype: doi + value: 10.1016/j.isci.2024.110802 +- idtype: pmcid + value: PMC11407023 +authors: +- authtype: Author + name: Markiewicz R +- authtype: Author + name: Segaert K +- authtype: Author + name: Mazaheri A +epubdate: 2024 Aug 23 +fulljournalname: iScience +issue: '9' +pages: '110802' +pmclivedate: 2024/09/17 +printpubdate: '' +pubdate: 2024 Aug 23 +sortdate: 2024/08/23 00:00 +source: iScience +title: Brain-to-brain coupling forecasts future joint action outcomes +uid: '11407023' +volume: '27' diff --git a/_data/citedby/11408537.yml b/_data/citedby/11408537.yml new file mode 100644 index 000000000..9342278de --- /dev/null +++ b/_data/citedby/11408537.yml @@ -0,0 +1,39 @@ +articleids: +- idtype: pmid + value: '39115626' +- idtype: doi + value: 10.1007/s10548-024-01073-z +- idtype: pmcid + value: PMC11408537 +authors: +- authtype: Author + name: Valt C +- authtype: Author + name: Tavella A +- authtype: Author + name: Berchio C +- authtype: Author + name: Seebold D +- authtype: Author + name: Sportelli L +- authtype: Author + name: Rampino A +- authtype: Author + name: Salisbury DF +- authtype: Author + name: Bertolino A +- authtype: Author + name: Pergola G +epubdate: 2024 Aug 8 +fulljournalname: Brain Topography +issue: '6' +pages: 993-1009 +pmclivedate: 2024/09/19 +printpubdate: '2024' +pubdate: 2024 Aug 8 +sortdate: 2024/08/08 00:00 +source: Brain Topogr +title: 'MEG Microstates: An Investigation of Underlying Brain Sources and Potential + Neurophysiological Processes' +uid: '11408537' +volume: '37' diff --git a/_data/citedby/11408544.yml b/_data/citedby/11408544.yml new file mode 100644 index 000000000..f0c5b526e --- /dev/null +++ b/_data/citedby/11408544.yml @@ -0,0 +1,31 @@ +articleids: +- idtype: pmid + value: '39066878' +- idtype: doi + value: 10.1007/s10548-024-01071-1 +- idtype: pmcid + value: PMC11408544 +authors: +- authtype: Author + name: Sasaki R +- authtype: Author + name: Hand BJ +- authtype: Author + name: Liao WY +- authtype: Author + name: Semmler JG +- authtype: Author + name: Opie GM +epubdate: 2024 Jul 27 +fulljournalname: Brain Topography +issue: '6' +pages: 1158-1170 +pmclivedate: 2024/09/19 +printpubdate: '2024' +pubdate: 2024 Jul 27 +sortdate: 2024/07/27 00:00 +source: Brain Topogr +title: Investigating the Effects of Repetitive Paired-Pulse Transcranial Magnetic + Stimulation on Visuomotor Training Using TMS-EEG +uid: '11408544' +volume: '37' diff --git a/_data/citedby/11410217.yml b/_data/citedby/11410217.yml new file mode 100644 index 000000000..f39667902 --- /dev/null +++ b/_data/citedby/11410217.yml @@ -0,0 +1,61 @@ +articleids: +- idtype: pmid + value: '39241107' +- idtype: doi + value: 10.1371/journal.pbio.3002774 +- idtype: pmcid + value: PMC11410217 +authors: +- authtype: Author + name: Cleary DR +- authtype: Author + name: Tchoe Y +- authtype: Author + name: Bourhis A +- authtype: Author + name: Dickey CW +- authtype: Author + name: Stedelin B +- authtype: Author + name: Ganji M +- authtype: Author + name: Lee SH +- authtype: Author + name: Lee J +- authtype: Author + name: Siler DA +- authtype: Author + name: Brown EC +- authtype: Author + name: Rosen BQ +- authtype: Author + name: Kaestner E +- authtype: Author + name: Yang JC +- authtype: Author + name: Soper DJ +- authtype: Author + name: Han SJ +- authtype: Author + name: Paulk AC +- authtype: Author + name: Cash SS +- authtype: Author + name: Raslan AM +- authtype: Author + name: Dayeh SA +- authtype: Author + name: Halgren E +epubdate: 2024 Sep 6 +fulljournalname: PLOS Biology +issue: '9' +pages: e3002774 +pmclivedate: 2024/09/18 +printpubdate: '' +pubdate: 2024 Sep 6 +sortdate: 2024/09/06 00:00 +source: PLoS Biol +title: Syllable processing is organized in discrete subregions of the human superior + temporal gyrus +uid: '11410217' +volume: '22' diff --git a/_data/citedby/11410353.yml b/_data/citedby/11410353.yml new file mode 100644 index 000000000..9bb80e465 --- /dev/null +++ b/_data/citedby/11410353.yml @@ -0,0 +1,24 @@ +articleids: +- idtype: pmid + value: '0' +- idtype: doi + value: 10.1162/nol_a_00147 +- idtype: pmcid + value: PMC11410353 +authors: +- authtype: Author + name: Politzer-Ahles S +- authtype: Author + name: Jap BA +epubdate: 2024 Sep 11 +fulljournalname: Neurobiology of Language +issue: '4' +pages: 818-843 +pmclivedate: 2024/09/19 +printpubdate: '' +pubdate: 2024 Sep 11 +sortdate: 2024/09/11 00:00 +source: Neurobiol Lang (Camb) +title: Can the Mismatch Negativity Really Be Elicited by Abstract Linguistic Contrasts? +uid: '11410353' +volume: '5' diff --git a/_data/citedby/11410390.yml b/_data/citedby/11410390.yml new file mode 100644 index 000000000..fe17eab9f --- /dev/null +++ b/_data/citedby/11410390.yml @@ -0,0 +1,24 @@ +articleids: +- idtype: pmid + value: '39042098' +- idtype: doi + value: 10.1088/1361-6560/ad66a9 +- idtype: pmcid + value: PMC11410390 +- idtype: MID + value: NIHMS2019582 +authors: +- authtype: Author + name: Ponasso GN +epubdate: 2024 Aug 28 +fulljournalname: Physics in medicine and biology +issue: '17' +pages: 10.1088/1361-6560/ad66a9 +pmclivedate: '' +printpubdate: '' +pubdate: 2024 Aug 28 +sortdate: 2024/08/28 00:00 +source: Phys Med Biol +title: A survey on integral equations for bioelectric modeling +uid: '11410390' +volume: '69' From f9e58be180805a3258b2f18c65681c3b08887633 Mon Sep 17 00:00:00 2001 From: Robert Oostenveld Date: Fri, 20 Sep 2024 12:11:39 +0200 Subject: [PATCH 11/23] spelling --- assets/wordlist-ignore.txt | 2 +- faq/continuous.md | 4 ++-- workshop.md | 6 +++--- workshop/tuebingen13.md | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/wordlist-ignore.txt b/assets/wordlist-ignore.txt index 750afda70..00eb6b1ff 100644 --- a/assets/wordlist-ignore.txt +++ b/assets/wordlist-ignore.txt @@ -1973,8 +1973,8 @@ Trento Trialpadding Trigon Triux +Tsilimparis Tübingen -Tuebingen Twente Tx TxZ diff --git a/faq/continuous.md b/faq/continuous.md index 801758e61..3452bc0ad 100644 --- a/faq/continuous.md +++ b/faq/continuous.md @@ -12,8 +12,8 @@ FieldTrip does not distinguish between the CTF files that are written as blocks The "Subject01.ds" CTF dataset that is used in some tutorials is epoched and has gaps between the trials. If you were to read that as continuous, you would see discontinuities in the MEG channels. If you were to apply the automatic artifact detection functions on that as continuous data, many trials would be detected as an artifact as they start/end with a discontinuous jump in some of the channels. Hence when reading that data the `cfg.continuous` option should be set to `"no"` (which is the default). -Many other CTF datasets are recorded as pseudocontinuous without gaps between the blocks and for those you do want to set the `cfg.continuous` option to `"yes"`. +Many other CTF datasets are recorded as pseudo-continuous without gaps between the blocks and for those you do want to set the `cfg.continuous` option to `"yes"`. -To check whether your data is epoched or pseudocontinuous, please have a look at the `SCLK01` channel. +To check whether your data is epoched or pseudo-continuous, please have a look at the `SCLK01` channel. Note that besides **[ft_preprocessing](/reference/ft_preprocessing)**, other functions that read data from disk also have the `cfg.continuous` option, such as **[ft_databrowser](/reference/ft_databrowser)** and the automatic artifact detection functions. diff --git a/workshop.md b/workshop.md index 45ae4fc59..47cfd9f77 100644 --- a/workshop.md +++ b/workshop.md @@ -53,7 +53,7 @@ Previous FieldTrip workshops took place at - 2017, [Jyväskylä, Finland](/workshop/jyvaskyla2017) - 2017, [MEG/EEG toolkit](/workshop/toolkit2017) - Nijmegen, NL - 2016, [Marseille, France](/workshop/marseille2016b) -- 2016, [Tuebingen, Germany](/workshop/tuebingen2016) +- 2016, [Tübingen, Germany](/workshop/tuebingen2016) - 2016, [Guangzhou, China](/workshop/guangzhou) - 2016, [London, UK](/workshop/london) - 2016, [Coimbra, Portugal](/workshop/coimbra) @@ -78,7 +78,7 @@ Previous FieldTrip workshops took place at - 2013, [Hamburg, Germany](/workshop/hamburg2013) - 2013, [San Sebastian, Spain](/workshop/donostia2013) - 2013, [Toronto, Canada](/workshop/toronto) -- 2013, [Tuebingen, Germany](/workshop/tuebingen13) +- 2013, [Tübingen, Germany](/workshop/tuebingen13) - 2013, MEG/EEG toolkit, Nijmegen, NL - 2012, [Trento, Italy](/workshop/trento) - 2012, [Krakow, Poland](/workshop/krakow) @@ -86,7 +86,7 @@ Previous FieldTrip workshops took place at - 2012, [Hamburg, Germany](/workshop/hamburg) - 2012, Leipzig, Germany - 2012, MEG/EEG toolkit, Nijmegen, NL -- 2011, Tuebingen, Germany +- 2011, Tübingen, Germany - 2011, [St Louis, USA](/workshop/stlouis) - 2011, New York, USA - 2011, MEG/EEG toolkit, Nijmegen, NL diff --git a/workshop/tuebingen13.md b/workshop/tuebingen13.md index fbba8cc28..b7cd8feed 100644 --- a/workshop/tuebingen13.md +++ b/workshop/tuebingen13.md @@ -24,7 +24,7 @@ version of FieldTrip that is distributed on a USB stcik, rather than the version have installed. Furthermore, the tutorial data does not have to be downloaded but will also be distributed on the USB stick. -1. Copy the complete Tuebingen directory from the USB stick to your computer +1. Copy the complete Tübingen directory from the USB stick to your computer 2. Unzip the fieldtrip-xxxxxxxx.zip file. 3. Unzip the "data.zip" and "spm atlas.zip" file, you should place the contents in the tutorial directory. From 05223ef42e039cd93d479367c489d16ffafd7c74 Mon Sep 17 00:00:00 2001 From: Robert Oostenveld Date: Fri, 20 Sep 2024 12:22:30 +0200 Subject: [PATCH 12/23] spelling --- _posts/2024-09-16-release.md | 2 +- assets/wordlist-ignore.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/_posts/2024-09-16-release.md b/_posts/2024-09-16-release.md index 654d57920..152f6e80c 100644 --- a/_posts/2024-09-16-release.md +++ b/_posts/2024-09-16-release.md @@ -1,7 +1,7 @@ --- title: 16 September 2024 - FieldTrip version 20240916 has been released categories: [release] -tweet: FieldTrip version 20240916 was just released with AMM and SSS for OPM data, improved BrainVision Core format support, a new ft_daddata function and various fixes. See http://www.fieldtriptoolbox.org/#16-september-2024 +tweet: FieldTrip version 20240916 was just released with AMM and SSS for OPM data, improved BrainVision Core format support, a new ft_baddata function and various fixes. See http://www.fieldtriptoolbox.org/#16-september-2024 --- ### 16 September, 2024 diff --git a/assets/wordlist-ignore.txt b/assets/wordlist-ignore.txt index 00eb6b1ff..c43c51372 100644 --- a/assets/wordlist-ignore.txt +++ b/assets/wordlist-ignore.txt @@ -13,6 +13,7 @@ AFz AII ALPHAMAP ALS +AMM AMU ANALYSISNAME ANCOVAs From 2d2b4d4dfa932d1a82aee95d0773a38175b17d00 Mon Sep 17 00:00:00 2001 From: Robert Oostenveld Date: Mon, 23 Sep 2024 14:25:01 +0200 Subject: [PATCH 13/23] revert to pristine version of bootstrap 4.0 --- assets/css/bootstrap/bootstrap.scss | 2 +- assets/css/bootstrap/mixins/_hover.scss | 2 +- assets/css/main.scss | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/assets/css/bootstrap/bootstrap.scss b/assets/css/bootstrap/bootstrap.scss index e3691c3e6..bb5fac868 100644 --- a/assets/css/bootstrap/bootstrap.scss +++ b/assets/css/bootstrap/bootstrap.scss @@ -4,7 +4,7 @@ * Copyright 2011-2018 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -@import "../custom/variables"; + @import "functions"; @import "variables"; @import "mixins"; diff --git a/assets/css/bootstrap/mixins/_hover.scss b/assets/css/bootstrap/mixins/_hover.scss index ae7e4a0f6..ec2e328a4 100644 --- a/assets/css/bootstrap/mixins/_hover.scss +++ b/assets/css/bootstrap/mixins/_hover.scss @@ -3,7 +3,7 @@ // Hover mixin and `$enable-hover-media-query` are deprecated. // // Origally added during our alphas and maintained during betas, this mixin was -// designed to prevent `:hover` stickiness on iOS an issue where hover styles +// designed to prevent `:hover` stickiness on iOS—an issue where hover styles // would persist after initial touch. // // For backward compatibility, we've kept these mixins and updated them to diff --git a/assets/css/main.scss b/assets/css/main.scss index 8a0a2b810..5b7bc72ce 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -1,6 +1,7 @@ --- --- +@import "custom/variables"; @import 'bootstrap/bootstrap'; @import 'custom/highlight-friendly.css'; @import 'custom/copy-code-button.css'; From 0ecdaac4016f77d1181335280ed5d3263b75759e Mon Sep 17 00:00:00 2001 From: Robert Oostenveld Date: Mon, 23 Sep 2024 15:17:46 +0200 Subject: [PATCH 14/23] update to bootstrap version 4.6.2 --- _includes/footer | 7 +- assets/css/bootstrap/_alert.scss | 51 - assets/css/bootstrap/_badge.scss | 47 - assets/css/bootstrap/_breadcrumb.scss | 38 - assets/css/bootstrap/_button-group.scss | 166 - assets/css/bootstrap/_buttons.scss | 143 - assets/css/bootstrap/_card.scss | 270 - assets/css/bootstrap/_carousel.scss | 191 - assets/css/bootstrap/_close.scss | 34 - assets/css/bootstrap/_code.scss | 56 - assets/css/bootstrap/_custom-forms.scss | 297 - assets/css/bootstrap/_dropdown.scss | 131 - assets/css/bootstrap/_forms.scss | 333 - assets/css/bootstrap/_functions.scss | 86 - assets/css/bootstrap/_grid.scss | 52 - assets/css/bootstrap/_images.scss | 42 - assets/css/bootstrap/_input-group.scss | 159 - assets/css/bootstrap/_jumbotron.scss | 16 - assets/css/bootstrap/_list-group.scss | 115 - assets/css/bootstrap/_media.scss | 8 - assets/css/bootstrap/_mixins.scss | 42 - assets/css/bootstrap/_modal.scss | 168 - assets/css/bootstrap/_nav.scss | 118 - assets/css/bootstrap/_navbar.scss | 311 - assets/css/bootstrap/_pagination.scss | 77 - assets/css/bootstrap/_popover.scss | 183 - assets/css/bootstrap/_print.scss | 124 - assets/css/bootstrap/_progress.scss | 33 - assets/css/bootstrap/_reboot.scss | 482 - assets/css/bootstrap/_root.scss | 19 - assets/css/bootstrap/_tables.scss | 180 - assets/css/bootstrap/_tooltip.scss | 115 - assets/css/bootstrap/_transitions.scss | 36 - assets/css/bootstrap/_type.scss | 125 - assets/css/bootstrap/_utilities.scss | 14 - assets/css/bootstrap/_variables.scss | 894 -- assets/css/bootstrap/bootstrap-grid.css | 3872 ++++++ assets/css/bootstrap/bootstrap-grid.css.map | 1 + assets/css/bootstrap/bootstrap-grid.min.css | 7 + .../css/bootstrap/bootstrap-grid.min.css.map | 1 + assets/css/bootstrap/bootstrap-grid.scss | 32 - assets/css/bootstrap/bootstrap-reboot.css | 325 + assets/css/bootstrap/bootstrap-reboot.css.map | 1 + assets/css/bootstrap/bootstrap-reboot.min.css | 8 + .../bootstrap/bootstrap-reboot.min.css.map | 1 + assets/css/bootstrap/bootstrap-reboot.scss | 12 - assets/css/bootstrap/bootstrap.css | 10332 ++++++++++++++++ assets/css/bootstrap/bootstrap.css.map | 1 + assets/css/bootstrap/bootstrap.min.css | 7 + assets/css/bootstrap/bootstrap.min.css.map | 1 + assets/css/bootstrap/bootstrap.scss | 42 - assets/css/bootstrap/mixins/_alert.scss | 13 - .../bootstrap/mixins/_background-variant.scss | 21 - assets/css/bootstrap/mixins/_badge.scss | 12 - .../css/bootstrap/mixins/_border-radius.scss | 35 - assets/css/bootstrap/mixins/_box-shadow.scss | 5 - assets/css/bootstrap/mixins/_breakpoints.scss | 123 - assets/css/bootstrap/mixins/_buttons.scss | 109 - assets/css/bootstrap/mixins/_caret.scss | 65 - assets/css/bootstrap/mixins/_clearfix.scss | 7 - assets/css/bootstrap/mixins/_float.scss | 11 - assets/css/bootstrap/mixins/_forms.scss | 137 - assets/css/bootstrap/mixins/_gradients.scss | 45 - .../css/bootstrap/mixins/_grid-framework.scss | 67 - assets/css/bootstrap/mixins/_grid.scss | 52 - assets/css/bootstrap/mixins/_hover.scss | 39 - assets/css/bootstrap/mixins/_image.scss | 36 - assets/css/bootstrap/mixins/_list-group.scss | 21 - assets/css/bootstrap/mixins/_lists.scss | 7 - assets/css/bootstrap/mixins/_nav-divider.scss | 10 - .../css/bootstrap/mixins/_navbar-align.scss | 10 - assets/css/bootstrap/mixins/_pagination.scss | 22 - assets/css/bootstrap/mixins/_reset-text.scss | 17 - assets/css/bootstrap/mixins/_resize.scss | 6 - .../css/bootstrap/mixins/_screen-reader.scss | 35 - assets/css/bootstrap/mixins/_size.scss | 6 - assets/css/bootstrap/mixins/_table-row.scss | 30 - .../css/bootstrap/mixins/_text-emphasis.scss | 14 - assets/css/bootstrap/mixins/_text-hide.scss | 9 - .../css/bootstrap/mixins/_text-truncate.scss | 8 - assets/css/bootstrap/mixins/_transition.scss | 9 - assets/css/bootstrap/mixins/_visibility.scss | 7 - assets/css/bootstrap/utilities/_align.scss | 8 - .../css/bootstrap/utilities/_background.scss | 19 - assets/css/bootstrap/utilities/_borders.scss | 59 - assets/css/bootstrap/utilities/_clearfix.scss | 3 - assets/css/bootstrap/utilities/_display.scss | 38 - assets/css/bootstrap/utilities/_embed.scss | 52 - assets/css/bootstrap/utilities/_flex.scss | 46 - assets/css/bootstrap/utilities/_float.scss | 9 - assets/css/bootstrap/utilities/_position.scss | 36 - .../bootstrap/utilities/_screenreaders.scss | 11 - assets/css/bootstrap/utilities/_sizing.scss | 12 - assets/css/bootstrap/utilities/_spacing.scss | 51 - assets/css/bootstrap/utilities/_text.scss | 52 - .../css/bootstrap/utilities/_visibility.scss | 11 - assets/css/custom/_customstyles.scss | 21 + assets/css/custom/_variables.scss | 1 - assets/css/main.scss | 3 +- 99 files changed, 14583 insertions(+), 6643 deletions(-) delete mode 100644 assets/css/bootstrap/_alert.scss delete mode 100644 assets/css/bootstrap/_badge.scss delete mode 100644 assets/css/bootstrap/_breadcrumb.scss delete mode 100644 assets/css/bootstrap/_button-group.scss delete mode 100644 assets/css/bootstrap/_buttons.scss delete mode 100644 assets/css/bootstrap/_card.scss delete mode 100644 assets/css/bootstrap/_carousel.scss delete mode 100644 assets/css/bootstrap/_close.scss delete mode 100644 assets/css/bootstrap/_code.scss delete mode 100644 assets/css/bootstrap/_custom-forms.scss delete mode 100644 assets/css/bootstrap/_dropdown.scss delete mode 100644 assets/css/bootstrap/_forms.scss delete mode 100644 assets/css/bootstrap/_functions.scss delete mode 100644 assets/css/bootstrap/_grid.scss delete mode 100644 assets/css/bootstrap/_images.scss delete mode 100644 assets/css/bootstrap/_input-group.scss delete mode 100644 assets/css/bootstrap/_jumbotron.scss delete mode 100644 assets/css/bootstrap/_list-group.scss delete mode 100644 assets/css/bootstrap/_media.scss delete mode 100644 assets/css/bootstrap/_mixins.scss delete mode 100644 assets/css/bootstrap/_modal.scss delete mode 100644 assets/css/bootstrap/_nav.scss delete mode 100644 assets/css/bootstrap/_navbar.scss delete mode 100644 assets/css/bootstrap/_pagination.scss delete mode 100644 assets/css/bootstrap/_popover.scss delete mode 100644 assets/css/bootstrap/_print.scss delete mode 100644 assets/css/bootstrap/_progress.scss delete mode 100644 assets/css/bootstrap/_reboot.scss delete mode 100644 assets/css/bootstrap/_root.scss delete mode 100644 assets/css/bootstrap/_tables.scss delete mode 100644 assets/css/bootstrap/_tooltip.scss delete mode 100644 assets/css/bootstrap/_transitions.scss delete mode 100644 assets/css/bootstrap/_type.scss delete mode 100644 assets/css/bootstrap/_utilities.scss delete mode 100644 assets/css/bootstrap/_variables.scss create mode 100644 assets/css/bootstrap/bootstrap-grid.css create mode 100644 assets/css/bootstrap/bootstrap-grid.css.map create mode 100644 assets/css/bootstrap/bootstrap-grid.min.css create mode 100644 assets/css/bootstrap/bootstrap-grid.min.css.map delete mode 100644 assets/css/bootstrap/bootstrap-grid.scss create mode 100644 assets/css/bootstrap/bootstrap-reboot.css create mode 100644 assets/css/bootstrap/bootstrap-reboot.css.map create mode 100644 assets/css/bootstrap/bootstrap-reboot.min.css create mode 100644 assets/css/bootstrap/bootstrap-reboot.min.css.map delete mode 100644 assets/css/bootstrap/bootstrap-reboot.scss create mode 100644 assets/css/bootstrap/bootstrap.css create mode 100644 assets/css/bootstrap/bootstrap.css.map create mode 100644 assets/css/bootstrap/bootstrap.min.css create mode 100644 assets/css/bootstrap/bootstrap.min.css.map delete mode 100644 assets/css/bootstrap/bootstrap.scss delete mode 100644 assets/css/bootstrap/mixins/_alert.scss delete mode 100644 assets/css/bootstrap/mixins/_background-variant.scss delete mode 100644 assets/css/bootstrap/mixins/_badge.scss delete mode 100644 assets/css/bootstrap/mixins/_border-radius.scss delete mode 100644 assets/css/bootstrap/mixins/_box-shadow.scss delete mode 100644 assets/css/bootstrap/mixins/_breakpoints.scss delete mode 100644 assets/css/bootstrap/mixins/_buttons.scss delete mode 100644 assets/css/bootstrap/mixins/_caret.scss delete mode 100644 assets/css/bootstrap/mixins/_clearfix.scss delete mode 100644 assets/css/bootstrap/mixins/_float.scss delete mode 100644 assets/css/bootstrap/mixins/_forms.scss delete mode 100644 assets/css/bootstrap/mixins/_gradients.scss delete mode 100644 assets/css/bootstrap/mixins/_grid-framework.scss delete mode 100644 assets/css/bootstrap/mixins/_grid.scss delete mode 100644 assets/css/bootstrap/mixins/_hover.scss delete mode 100644 assets/css/bootstrap/mixins/_image.scss delete mode 100644 assets/css/bootstrap/mixins/_list-group.scss delete mode 100644 assets/css/bootstrap/mixins/_lists.scss delete mode 100644 assets/css/bootstrap/mixins/_nav-divider.scss delete mode 100644 assets/css/bootstrap/mixins/_navbar-align.scss delete mode 100644 assets/css/bootstrap/mixins/_pagination.scss delete mode 100644 assets/css/bootstrap/mixins/_reset-text.scss delete mode 100644 assets/css/bootstrap/mixins/_resize.scss delete mode 100644 assets/css/bootstrap/mixins/_screen-reader.scss delete mode 100644 assets/css/bootstrap/mixins/_size.scss delete mode 100644 assets/css/bootstrap/mixins/_table-row.scss delete mode 100644 assets/css/bootstrap/mixins/_text-emphasis.scss delete mode 100644 assets/css/bootstrap/mixins/_text-hide.scss delete mode 100644 assets/css/bootstrap/mixins/_text-truncate.scss delete mode 100644 assets/css/bootstrap/mixins/_transition.scss delete mode 100644 assets/css/bootstrap/mixins/_visibility.scss delete mode 100644 assets/css/bootstrap/utilities/_align.scss delete mode 100644 assets/css/bootstrap/utilities/_background.scss delete mode 100644 assets/css/bootstrap/utilities/_borders.scss delete mode 100644 assets/css/bootstrap/utilities/_clearfix.scss delete mode 100644 assets/css/bootstrap/utilities/_display.scss delete mode 100644 assets/css/bootstrap/utilities/_embed.scss delete mode 100644 assets/css/bootstrap/utilities/_flex.scss delete mode 100644 assets/css/bootstrap/utilities/_float.scss delete mode 100644 assets/css/bootstrap/utilities/_position.scss delete mode 100644 assets/css/bootstrap/utilities/_screenreaders.scss delete mode 100644 assets/css/bootstrap/utilities/_sizing.scss delete mode 100644 assets/css/bootstrap/utilities/_spacing.scss delete mode 100644 assets/css/bootstrap/utilities/_text.scss delete mode 100644 assets/css/bootstrap/utilities/_visibility.scss delete mode 100644 assets/css/custom/_variables.scss diff --git a/_includes/footer b/_includes/footer index 918e86977..75e65ab2b 100644 --- a/_includes/footer +++ b/_includes/footer @@ -1,8 +1,9 @@ - - - + + + +